diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2005-12-09 09:10:38 +0000 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2005-12-09 09:10:38 +0000 |
| commit | a3e5f77bc1cbd7fcf911782bb264e67b753aef71 (patch) | |
| tree | 71f15d76d81b3bae2fe36d0419d046da62c73c99 /debian/changelog | |
| parent | a947ddf372849cb7ba989c16661974c2333e3257 (diff) | |
* fixed conflict in changelog
Diffstat (limited to 'debian/changelog')
| -rw-r--r-- | debian/changelog | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog index 2061f8125..f7f00354f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ apt (0.6.43ubuntu2) dapper; urgency=low - * merged some missing bits that where dropped by the previous - merge (*cough*) + * merged some missing bits that wheren't merged by baz in the previous + upload (*grumble*) -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 8 Dec 2005 18:35:58 +0100 @@ -29,8 +29,7 @@ apt (0.6.43) unstable; urgency=medium * Fix GNU/kFreeBSD crash on non-existing server file (closes: #317718) * switch to libdb4.3 in build-depends -<<<<<<< TREE - -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 25 Nov 2005 11:22:31 +0100 + -- Michael Vogt <mvo@debian.org> Tue, 29 Nov 2005 00:17:07 +0100 apt (0.6.42.3ubuntu2) dapper; urgency=low @@ -47,9 +46,6 @@ apt (0.6.42.3ubuntu1) dapper; urgency=low * synced with debian -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 10 Nov 2005 05:05:56 +0100 -======= - -- Michael Vogt <mvo@debian.org> Tue, 29 Nov 2005 00:17:07 +0100 ->>>>>>> MERGE-SOURCE apt (0.6.42.3) unstable; urgency=low |