From 2cf4cfe8c0553a683b01ebc837f6bd3e26df6d51 Mon Sep 17 00:00:00 2001
From: djes <djes1975@gmail.com>
Date: Mon, 3 Oct 2016 22:39:40 +0200
Subject: [PATCH] check

---
 PBMap.pb | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/PBMap.pb b/PBMap.pb
index c3fceec..48af76d 100644
--- a/PBMap.pb
+++ b/PBMap.pb
@@ -2332,21 +2332,10 @@ CompilerIf #PB_Compiler_IsMainFile
   
 CompilerEndIf
 
-<<<<<<< HEAD
+
 ; IDE Options = PureBasic 5.42 LTS (Windows - x64)
-; CursorPosition = 961
-; FirstLine = 939
-=======
-; IDE Options = PureBasic 5.50 (Windows - x64)
-; CursorPosition = 1156
-; FirstLine = 1144
->>>>>>> parent of 8648364... Linux SetActiveGadget(-1) fix
-; Folding = ----------------
-; EnableThread
-; EnableXP
-; IDE Options = PureBasic 5.42 LTS (Windows - x64)
-; CursorPosition = 2308
-; FirstLine = 2291
+; CursorPosition = 2334
+; FirstLine = 2280
 ; Folding = ----------------
 ; EnableUnicode
 ; EnableXP
\ No newline at end of file