added a load of stuff, and fixed a git conflict

1 files changed, 0 insertions, 12 deletions

diff --git a/comp/lucas-standen-NEA/code/parser/Makefile b/comp/lucas-standen-NEA/code/parser/Makefile
deleted file mode 100644
index 9325d95..0000000
--- a/comp/lucas-standen-NEA/code/parser/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-all: readfile preprocesor parser
-	cc readfile.o preprocessor.o parser.o -o parser 
-
-readfile:
-	cc -c readfile.c -o readfile.o
-preprocesor: 
-	cc -c preprocessor.c -o preprocessor.o
-parser: parser.c
-	cc -c parser.c -o parser.o
-
-clean:
-	rm -rf *.o parser