Browse Source

Remove conflict indicators

Wichert Akkerman 25 years ago
parent
commit
1b34a96760
1 changed files with 0 additions and 1 deletions
  1. 0 1
      ChangeLog

+ 0 - 1
ChangeLog

@@ -21,7 +21,6 @@ Sun Apr 29 22:08:37 CDT 2001 Adam Heath <doogie@debian.org>
     run.  However, a -static.nondebbin.tar.gz file is created, in addition
     to the normal nondebbin.tar.gz.
 
->>>>>>> 1.446
 Mon Apr 30 02:35:02 CEST 2001 Wichert Akkerman <wakkerma@debian.org>
 
   * debian/control: update section and priorities to match the dinstall