Resolve changelog conflict
This commit is contained in:
commit
9ad972a567
6
debian/changelog
vendored
6
debian/changelog
vendored
@ -1,3 +1,9 @@
|
||||
offlineimap (4.0.15) unstable; urgency=low
|
||||
|
||||
* Applied patch from Aaron Schrab to sync INTERNALDATEs.
|
||||
|
||||
-- John Goerzen <jgoerzen@complete.org> Mon, 21 Aug 2006 05:17:48 -0500
|
||||
|
||||
offlineimap (4.0.14) unstable; urgency=low
|
||||
|
||||
* ACK NMU 4.0.13-0.1. Thanks, Pierre. Closes: #380880.
|
||||
|
Loading…
Reference in New Issue
Block a user