summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog1
1 files changed, 0 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 28dfe0e58..d282e4152 100644
--- 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)