X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/bae108264e918e6f256d36bfce2a6c79b4b2a3ed..bb4fc0a9e4e105a13b3a032b28802a84523fc506:/debian/changelog

diff --git a/debian/changelog b/debian/changelog
index ac1e0e663..acf74d166 100644
--- 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