Garbage added by magit?

5 years ago · 3a7ee19cab
parent 0ab0699934
commit 3a7ee19cab
1 changed files with 0 additions and 5 deletions
--- 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