* merged apt--main and make sure that the po files come from apt--main (because they...

[apt.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 28dfe0e58c94d7bf9fc2519c3e799fb421ad6da3..d282e415213d1f06466842a41d5ae19872c97e57 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -84,7 +84,6 @@ apt (0.6.34) hoary; urgency=low
 
  -- Matt Zimmerman <mdz@ubuntu.com>  Fri,  4 Mar 2005 16:13:15 -0800
 
->>>>>>> MERGE-SOURCE
 apt (0.6.33) hoary; urgency=low
 
   * Merge michael.vogt@ubuntu.com--2005/apt--mvo--0 (through patch-6)