Merge branch 'master' of git.bradymcd.ca:scheming

5 years ago · 0ab0699934
parent 9f8010bae2 dc21dc0671
commit 0ab0699934
1 changed files with 4 additions and 0 deletions
--- a/tk/listlogic.scm
+++ b/tk/listlogic.scm
@ -68,5 +68,9 @@
     (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