zap old conflict indicator

diff --git a/ChangeLog b/ChangeLog
index 694e503c9cc91c72abb78941913e8e689046b23e..f49d71db0ce6c0f588e9a102ce2fd72f73745330 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -626,7 +626,6 @@ Thu Dec 21 06:58:21 CET 2000 peter karlsson <peterk@debian.org>
 
   * po/sv.po: The "Merry Christmas" update of the Swedish translation.
 
->>>>>>> 1.261
 Wed Dec 20 12:50:55 CET 2000 Wichert Akkerman <wakkerma@debian.org>
 
   * main/processarc.c: revert change from Adam: reading the trailing