diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2005-06-26 10:04:00 +0000 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2005-06-26 10:04:00 +0000 |
| commit | 17c78c79f45d8dbb2a4fc5b453569ffbd4373f2e (patch) | |
| tree | e02ee281716664115b70419c6c5303328310a737 /debian/changelog | |
| parent | 6804503b9bd057fae67294bb8ca95c9f10e00194 (diff) | |
* merged apt--main and make sure that the po files come from apt--main (because they are more recent)
Diffstat (limited to 'debian/changelog')
| -rw-r--r-- | debian/changelog | 1 |
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) |