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