From f78e9ea16278631d801b6539497347efba144c5b Mon Sep 17 00:00:00 2001
From: Chris Cochrun <chris@cochrun.xyz>
Date: Mon, 11 Nov 2024 05:50:25 -0600
Subject: [PATCH] removing broken git info

---
 src/main.lisp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/main.lisp b/src/main.lisp
index dd70ec3..012da67 100644
--- a/src/main.lisp
+++ b/src/main.lisp
@@ -9,10 +9,7 @@
 (asdf:load-system 'log4cl)
 (asdf:load-system 'fiveam)
 (asdf:load-system 'clack)
-<<<<<<< HEAD
 (asdf:load-system 'ningle)
-=======
->>>>>>> 4ab5c05 (idk)
 
 (defpackage tfcserver
   (:use :cl :com.inuoe.jzon :spinneret :serapeum))