fix: merge conflicts

This commit is contained in:
Jonathan Kelley committed 2022-02-26 17:35:23 -05:00
1 parent 77631bff1f
commit 56517ef5de
3 files changed
+5 -2

No files matched your search

+1
View File
@@ -125,6 +125,7 @@ use wry::application::window::Fullscreen as WryFullscreen;
use crate::controller::DesktopController;
#[derive(Debug)]
pub enum UserWindowEvent {
Update,