diff options
| author | william341 <[email protected]> | 2016-07-25 12:18:40 -0700 |
|---|---|---|
| committer | william341 <[email protected]> | 2016-07-25 12:18:40 -0700 |
| commit | 5e4ac239005aeba9d190a3c6d428917dd94de607 (patch) | |
| tree | 36516b6db3eb0f2b6fa5289b5bd941996474e17c /source/WindowsFormsApplication1/Apps/Cheats.cs | |
| parent | 46c1c31302f111a1f3ec23a70e6f3986a9aa2a27 (diff) | |
| download | shiftos-c--5e4ac239005aeba9d190a3c6d428917dd94de607.tar.gz shiftos-c--5e4ac239005aeba9d190a3c6d428917dd94de607.tar.bz2 shiftos-c--5e4ac239005aeba9d190a3c6d428917dd94de607.zip | |
OooOOO easter egg
Diffstat (limited to 'source/WindowsFormsApplication1/Apps/Cheats.cs')
| -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 |