From cbf3eaeee0e189150a933fbe6854f7256df1d59a Mon Sep 17 00:00:00 2001 From: Christian Perrier Date: Mon, 24 Sep 2007 06:08:32 +0200 Subject: [PATCH] Merge versions (HEAD and mine) --- debian/changelog | 5 ----- scripts/po/ChangeLog | 6 +----- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index 14c9664a..0a8c8706 100644 --- a/debian/changelog +++ b/debian/changelog @@ -36,15 +36,10 @@ dpkg (1.14.7) UNRELEASED; urgency=low * Swedish (Peter Karlsson). * Korean (Sunjae Park). Closes: #443191 -<<<<<<< HEAD:debian/changelog [ Updated scripts translations ] * Correct a typo in the French translation. Closes: #443276 - - -- Guillem Jover Thu, 06 Sep 2007 03:42:40 +0300 -======= -- Frank Lichtenheld Sun, 23 Sep 2007 02:40:20 +0200 ->>>>>>> 482cc83e0404956b88767cde50f744e72c0e9516:debian/changelog dpkg (1.14.6) unstable; urgency=low diff --git a/scripts/po/ChangeLog b/scripts/po/ChangeLog index 530ad102..9c924eaa 100644 --- a/scripts/po/ChangeLog +++ b/scripts/po/ChangeLog @@ -1,13 +1,9 @@ -<<<<<<< HEAD:scripts/po/ChangeLog -2007-09-20 Christian Perrier -======= 2007-09-23 Frank Lichtenheld * dpkg-dev.pot: Regenerated. * *.po: Merged with dpkg-dev.pot. -2007-08-30 Peter Karlsson ->>>>>>> 482cc83e0404956b88767cde50f744e72c0e9516:scripts/po/ChangeLog +2007-09-20 Christian Perrier * fr.po: Typo correcion -- 2.39.5