1 files changed, 0 insertions, 4 deletions
diff --git a/main.c b/main.c
index 8561f26..5f69aa7 100644
--- a/main.c
+++ b/main.c
@@ -18,10 +18,6 @@
 
 /* 
 TODO:
-<<<<<<< HEAD
-=======
-no foreign parameter declarations
->>>>>>> 3fa3c17a12cb52edbcc9890cad59d610e0360f90
 see NOTE in test.toc
 variadic fns
 #include