aboutsummaryrefslogtreecommitdiff
path: root/source/WindowsFormsApplication1/Apps/Cheats.cs
diff options
context:
space:
mode:
Diffstat (limited to 'source/WindowsFormsApplication1/Apps/Cheats.cs')
-rw-r--r--source/WindowsFormsApplication1/Apps/Cheats.cs4
1 files changed, 4 insertions, 0 deletions
diff --git a/source/WindowsFormsApplication1/Apps/Cheats.cs b/source/WindowsFormsApplication1/Apps/Cheats.cs
index a37021b..d477cd9 100644
--- a/source/WindowsFormsApplication1/Apps/Cheats.cs
+++ b/source/WindowsFormsApplication1/Apps/Cheats.cs
@@ -6,7 +6,11 @@ using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+<<<<<<< HEAD
using ShiftUI;
+=======
+using System.Windows.Forms;
+>>>>>>> refs/remotes/origin/master
using ShiftOS.Online.Hacking;
namespace ShiftOS.Apps