From 3a7ee19cab07802d06feaedee0f77b1eefd949de Mon Sep 17 00:00:00 2001
From: Brady McDonough <brady.mcd.codes@gmail.com>
Date: Tue, 6 Apr 2021 01:10:50 -0600
Subject: [PATCH] Garbage added by magit?

---
 tk/listlogic.scm | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/tk/listlogic.scm b/tk/listlogic.scm
index 6533b6b..3e84926 100644
--- a/tk/listlogic.scm
+++ b/tk/listlogic.scm
@@ -68,9 +68,4 @@
      (begin (if (not $cond) (display $message))
             (newline)))
     ((display-if-not $cond . $messages)
-<<<<<<< HEAD
      (display-if-not $cond (string-concatenate/shared `$messages)))))
-
-=======
-     (display-if-not $cond (string-concatenate/shared '$messages)))))
->>>>>>> dc21dc06718f65e8588149231d5bbf5cac5b46aa