merged make file

3 files changed, 3 insertions, 7 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)
diff --git a/bin/chess_ai b/bin/chess_ai
index 6114edc..1494202 100755
--- a/bin/chess_ai
+++ b/bin/chess_ai
diff --git a/include/chess_tester.hpp b/include/chess_tester.hpp
index c0c2f1c..d2994ad 100644
--- a/include/chess_tester.hpp
+++ b/include/chess_tester.hpp
@@ -32,7 +32,7 @@ struct tested_pieces {
 };
 
 class chess_tester {
-    
+
 public:
 
     // sets all the initial values for the tester
@@ -56,7 +56,7 @@ public:
 
     // see if test is in vector
     bool is_in_vec(const tested_pieces& piece) const;
-    
+
 private:
 
     // checks if the test suite is running