[Aptitude-svn-commit] r3608 - branches/aptitude-0.3/aptitude

[Daniel Burrows]

Author: dburrows
Date: Mon Jul  4 16:39:39 2005
New Revision: 3608

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
Log:
Remove old conflict markers

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Mon Jul  4 16:39:39 2005
@@ -494,7 +494,6 @@
 	  sane (as sane as is possible given how control keys are
 	  handled).
 
->>>>>>> .r3514
 2005-06-27 Håvard Korsvoll <korsvoll@skulelinux.no>
 
 	* Updated Norwegian nynorsk translation
@@ -875,7 +874,6 @@
 	  monster manage to avoid detection for so long?).
 	  Closes: #315359
 
->>>>>>> .r3490
 2005-06-22 Luk Claes <luk@debian.org>
 
 	* Updated Dutch translation