From abe52183e0e34051196d72ac0e56733bd0749bdd Mon Sep 17 00:00:00 2001 From: Michael VanOverbeek Date: Mon, 25 Jul 2016 14:30:01 -0400 Subject: Fix Cheats and some designer stuff --- source/WindowsFormsApplication1/Apps/Cheats.cs | 4 ---- 1 file changed, 4 deletions(-) (limited to 'source/WindowsFormsApplication1/Apps') diff --git a/source/WindowsFormsApplication1/Apps/Cheats.cs b/source/WindowsFormsApplication1/Apps/Cheats.cs index d477cd9..a37021b 100644 --- a/source/WindowsFormsApplication1/Apps/Cheats.cs +++ b/source/WindowsFormsApplication1/Apps/Cheats.cs @@ -6,11 +6,7 @@ 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 -- cgit v1.2.3