]> err.no Git - dpkg/commit
scripts/po/ChangeLog: Fix merge mess
authorFrank Lichtenheld <djpig@debian.org>
Mon, 24 Sep 2007 12:31:17 +0000 (14:31 +0200)
committerFrank Lichtenheld <djpig@debian.org>
Mon, 24 Sep 2007 12:31:17 +0000 (14:31 +0200)
commit0fade120552f6b5c9d5f979e84360884ce615f1e
tree11256366142eb2389d81539fe3cf65a878c09271
parentf4d3e5971e7095865f6a41c2cbabf63ac818bce8
scripts/po/ChangeLog: Fix merge mess
scripts/po/ChangeLog