1 files changed, 0 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index a019bcd..31bb170 100644
--- a/Makefile
+++ b/Makefile
@@ -266,11 +266,7 @@ $(BIN_DIR)/$(SERVERNAME)/bin/lua51$(DYN_LIB_EXT) : $(LIB_D_LUA)
 	$(CP) $^ $@
 
 $(LLUADIR)/src/libluajit$(STA_LIB_EXT) : $(LLUADIR)/src/Makefile
-<<<<<<< HEAD
-	$(CP) $(LLUADIR)/src && make "BUILDMODE= static"
-=======
 	cd $(LLUADIR)/src && $(MAKE) $(LUAJIT_ARGS) "BUILDMODE= static"
->>>>>>> 3623bc70af309d1823c664a8129956da6c0e9c4a
 
 $(LIB_S_LUA) : $(LLUADIR)/src/libluajit$(STA_LIB_EXT)
 	$(CP) $^ $@