From 17c78c79f45d8dbb2a4fc5b453569ffbd4373f2e Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Sun, 26 Jun 2005 10:04:00 +0000 Subject: * merged apt--main and make sure that the po files come from apt--main (because they are more recent) --- debian/changelog | 1 - 1 file changed, 1 deletion(-) (limited to 'debian/changelog') 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 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) -- cgit v1.2.3