X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;ds=sidebyside;f=build.bat;h=ff46ff553647afd27557beefc149b108afb400b8;hb=fe33d1fc0a741a114c4dce122d81ae6ae345071f;hp=0d39603d338ea8ad319410b8765c88078aacd410;hpb=0aed9f9d49f034aad7d8856db00fe42f3303826d;p=d2df-sdl.git

diff --git a/build.bat b/build.bat
index 0d39603..ff46ff5 100644
--- 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