Removed some junk

diff --git a/ice-9/ChangeLog b/ice-9/ChangeLog
index b45997d..8733e6a 100644 (file)
--- a/ice-9/ChangeLog
+++ b/ice-9/ChangeLog
@@ -324,7 +324,6 @@
        (process-define-module): Bugfix: Make sure that exports are done
        *after* all used interfaces has been added.
 
->>>>>>> 1.341
 2000-07-24  Marius Vollmer  <mvo@zagadka.ping.de>
 
        * common-list.scm (uniq): Made tail-recursive.  Thanks to thi!