fuck you, git

[d2df-sdl.git] / build.bat

diff --git a/build.bat b/build.bat
index 0d39603d338ea8ad319410b8765c88078aacd410..ff46ff553647afd27557beefc149b108afb400b8 100644 (file)
--- a/build.bat
+++ b/build.bat
@@ -1,9 +1,5 @@
 @echo off
 cd "./src/game"
 fpc -dUSE_FMOD -MDELPHI -O2 -Fi../lib/vampimg -Fi../lib/vampimg/JpegLib -Fi../lib/vampimg/ZLib -Fu../lib/vampimg -Fu../lib/vampimg/JpegLib -Fu../lib/vampimg/ZLib -FE../../bin -FU../../tmp Doom2DF.dpr
-<<<<<<< HEAD
-cd ".."
-=======
 cd "../.."
->>>>>>> 32fab4b... can load map scripts from wads now
-pause
\ No newline at end of file
+pause