Add files via upload

craftwar · Jan 15, 2017 · 830b2dc · 830b2dc
1 parent 99a8594
commit 830b2dc
Showing 1 changed file with 1 addition and 10 deletions.
diff --git a/suspend/README.txt b/suspend/README.txt
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 Usage: 
 
 suspend.exe [-r] ProcessName1 [ProcessName2] .....
@@ -8,12 +7,4 @@ to suspend
 suspend.exe a.exe b.exe
 
 to resume
-suspend.exe -r a.exe b.exe
-=======
-Usage: 
-to suspend
-suspend.exe [process name] .....
-
-to resume
-suspend.exe -r [process name] .....
->>>>>>> origin/master
+suspend.exe -r a.exe b.exe