Fix some spacing and indents

ethanpil · Apr 19, 2020 · 853b817 · 853b817
1 parent 3d9b25b
commit 853b817
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/snips.ahk b/snips.ahk
@@ -182,11 +182,7 @@ GUIEscape:
     if (!SRvisible) {
         LV_Delete()
         gui, 1:hide
-<<<<<<< HEAD
         return
-=======
-
->>>>>>> parent of 16b65db... Fix: ESC sometimes still sends data
     }
 
 }
@@ -357,7 +353,7 @@ SnipSend(snipid) {
 exit:
 {
    exitapp
- }
+}
 return
 
 AddSubFolderToTree(Folder, ParentItemID = 0)