From b7d3b6e10542a2f05b64d0fccb5f038a7edba393 Mon Sep 17 00:00:00 2001
From: Alexander <alex@cogarr.net>
Date: Thu, 10 Jan 2019 20:49:14 -0500
Subject: Finished cleaning up merge

---
 Makefile | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'Makefile')

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) $^ $@
-- 
cgit v1.2.3-70-g09d2