From 49d4492692d0b1fa382ecadfd4ef76107f584df7 Mon Sep 17 00:00:00 2001
From: Leo Tenenbaum <pommicket@gmail.com>
Date: Thu, 23 Jan 2020 23:33:37 -0500
Subject: agh

---
 main.c | 4 ----
 1 file changed, 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
-- 
cgit v1.2.3