diff options
| author | Michael VanOverbeek <[email protected]> | 2016-07-25 12:54:08 -0400 |
|---|---|---|
| committer | Michael VanOverbeek <[email protected]> | 2016-07-25 12:54:08 -0400 |
| commit | 6fa16209519896de09949a27425dff00ebf2970a (patch) | |
| tree | f00af7ea3f6ad2641fb26fa1d310fd8b7179b39c /source/WindowsFormsApplication1/Apps/Cheats.cs | |
| parent | 401ae1bb353887a2b90a3dbf53b8913dc84d70a9 (diff) | |
| parent | af48e774189596b8d7a058c564a7d6d75205ca03 (diff) | |
| download | shiftos-c--6fa16209519896de09949a27425dff00ebf2970a.tar.gz shiftos-c--6fa16209519896de09949a27425dff00ebf2970a.tar.bz2 shiftos-c--6fa16209519896de09949a27425dff00ebf2970a.zip | |
Merge remote-tracking branch 'refs/remotes/origin/master' into shiftui_integration
Diffstat (limited to 'source/WindowsFormsApplication1/Apps/Cheats.cs')
| -rw-r--r-- | source/WindowsFormsApplication1/Apps/Cheats.cs | 4 |
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 |