From 75e5b1c7cd4aee4133f47096a28b320d75dcc6be Mon Sep 17 00:00:00 2001 From: Alekhya Reddy Date: Mon, 23 Mar 2020 16:18:52 -0700 Subject: [PATCH] Manually resolving conflicts --- src/modules/launcher/Wox/SettingWindow.xaml | 396 ------------------ .../launcher/Wox/SettingWindow.xaml.cs | 265 ------------ 2 files changed, 661 deletions(-) delete mode 100644 src/modules/launcher/Wox/SettingWindow.xaml delete mode 100644 src/modules/launcher/Wox/SettingWindow.xaml.cs diff --git a/src/modules/launcher/Wox/SettingWindow.xaml b/src/modules/launcher/Wox/SettingWindow.xaml deleted file mode 100644 index e42f1d598a..0000000000 --- a/src/modules/launcher/Wox/SettingWindow.xaml +++ /dev/null @@ -1,396 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -