1 files changed, 1 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index ccca428..d08e45f 100644
--- a/Makefile
+++ b/Makefile
@@ -7,12 +7,8 @@ TARGET := bin/chess_ai
 SRCEXT := cpp
 SOURCES := $(shell find $(SRCDIR) -type f -name "*.$(SRCEXT)")
 OBJECTS := $(patsubst $(SRCDIR)/%,$(BUILDDIR)/%,$(SOURCES:.$(SRCEXT)=.o))
-<<<<<<< HEAD
-CFLAGS := -g -Wall -Wextra -std=c++14
-=======
 CFLAGS := -g -Wall -Wextra -Wpedantic -std=c++14
->>>>>>> 95f75aa7aacf5e0e1ef11e8d200f84de44bd891f
-LIB := 
+LIB :=
 INC := -I include
 
 $(TARGET): $(OBJECTS)