From: Wichert Akkerman <wakkerma@debian.org>
Date: Fri, 20 Apr 2001 21:07:45 +0000 (+0000)
Subject: zap old conflict indicator
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=341b794d97bcad54191fca0d3d5ae3999d4a78fe;p=dpkg

zap old conflict indicator
---

diff --git a/ChangeLog b/ChangeLog
index 694e503c..f49d71db 100644
--- 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