diff options
| author | Michael VanOverbeek <[email protected]> | 2016-07-25 14:30:01 -0400 |
|---|---|---|
| committer | Michael VanOverbeek <[email protected]> | 2016-07-25 14:30:01 -0400 |
| commit | abe52183e0e34051196d72ac0e56733bd0749bdd (patch) | |
| tree | 638c953bd194a160259f60380eeb55b5ff27da19 /source/WindowsFormsApplication1/Apps | |
| parent | 46c1c31302f111a1f3ec23a70e6f3986a9aa2a27 (diff) | |
| download | shiftos-c--abe52183e0e34051196d72ac0e56733bd0749bdd.tar.gz shiftos-c--abe52183e0e34051196d72ac0e56733bd0749bdd.tar.bz2 shiftos-c--abe52183e0e34051196d72ac0e56733bd0749bdd.zip | |
Fix Cheats and some designer stuff
Diffstat (limited to 'source/WindowsFormsApplication1/Apps')
| -rw-r--r-- | source/WindowsFormsApplication1/Apps/Cheats.cs | 4 |
1 files changed, 0 insertions, 4 deletions
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 |