From 853b8175d4864460af527f09d5d378e061d81f42 Mon Sep 17 00:00:00 2001
From: ethanpil <ethan@piliavin.com>
Date: Sat, 18 Apr 2020 23:29:19 -0700
Subject: [PATCH] Fix some spacing and indents

---
 snips.ahk | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/snips.ahk b/snips.ahk
index 7521dba..58841a7 100644
--- 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)