Fix some spacing and indents

ethanpil · ethanpil · commit 853b8175d486 · 2020-04-18T23:29:19.000-07:00
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)

Original file line number	Diff line number	Diff line change
`@@ -182,11 +182,7 @@ GUIEscape:`
`182`	`182`	`if (!SRvisible) {`
`183`	`183`	`LV_Delete()`
`184`	`184`	`gui, 1:hide`
`185`		`-<<<<<<< HEAD`
`186`	`185`	`return`
`187`		`-=======`
`188`		`-`
`189`		`->>>>>>> parent of 16b65db... Fix: ESC sometimes still sends data`
`190`	`186`	`}`
`191`	`187`
`192`	`188`	`}`
`@@ -357,7 +353,7 @@ SnipSend(snipid) {`
`357`	`353`	`exit:`
`358`	`354`	`{`
`359`	`355`	`exitapp`
`360`		`- }`
	`356`	`+}`
`361`	`357`	`return`
`362`	`358`
`363`	`359`	`AddSubFolderToTree(Folder, ParentItemID = 0)`