added a load of stuff, and fixed a git conflict

1 files changed, 0 insertions, 24 deletions

diff --git a/comp/lucas-standen-NEA/code/parser/preprocessor.c b/comp/lucas-standen-NEA/code/parser/preprocessor.c
deleted file mode 100644
index 92c6127..0000000
--- a/comp/lucas-standen-NEA/code/parser/preprocessor.c
+++ /dev/null
@@ -1,24 +0,0 @@
-#include <stdbool.h>
-#include <string.h>
-
-#include "readfile.h"
-
-char *preprocessor(int argc, char **argv){
-	char *buf = readfile(argv[1]);
-	if (buf == NULL)
-		return NULL;
-	
-	int i = 0;
-
-	while (buf[i] != '\0'){
-		if (buf[i] == '\n'){
-			buf[i] = ' ';
-		}
-		if (buf[i] == '\t'){
-			buf[i] = ' ';
-		}
-		i++;
-	}
-
-	return buf;
-}