* merged with apt--mvo

[apt.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index ac1e0e663fe10ca2230117a39fcca6fdf885d10d..acf74d1667a175e32f1bd8e74c48dec36d0206df 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -95,6 +95,7 @@ apt (0.6.38) unstable; urgency=low
   
  -- Matt Zimmerman <mdz@debian.org>  Sat, 25 Jun 2005 09:51:00 -0700
 
+>>>>>>> MERGE-SOURCE
 apt (0.6.37) breezy; urgency=low
 
   * Merge bubulle@debian.org--2005/apt--main--0 up to patch-81