thyphoon/PBMap
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

check

Browse Source
This commit is contained in:
djes
2016-10-03 22:39:40 +02:00
parent 8ac8a08059
commit 2cf4cfe8c0
1 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
PBMap.pb
View File

@@ -2332,21 +2332,10 @@ CompilerIf #PB_Compiler_IsMainFile
CompilerEndIf CompilerEndIf
<<<<<<< HEAD
; IDE Options = PureBasic 5.42 LTS (Windows - x64) ; IDE Options = PureBasic 5.42 LTS (Windows - x64)
; CursorPosition = 961 ; CursorPosition = 2334
; FirstLine = 939 ; FirstLine = 2280
=======
; 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
; Folding = ---------------- ; Folding = ----------------
; EnableUnicode ; EnableUnicode
; EnableXP ; EnableXP