Merge versions (HEAD and mine)

diff --git a/debian/changelog b/debian/changelog
index 14c9664a9b7936951d4e2cb7d46af1974de85882..0a8c8706d606f691805d8893e90be44de6a0a3a0 100644 (file)
--- 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 <guillem@debian.org>  Thu, 06 Sep 2007 03:42:40 +0300
-=======
  -- Frank Lichtenheld <djpig@debian.org>  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 530ad10230df364d886220b14c5a27af08f080c9..9c924eaa921e0b6110ebe61e8493e33335a0811c 100644 (file)
--- a/scripts/po/ChangeLog
+++ b/scripts/po/ChangeLog
@@ -1,13 +1,9 @@
-<<<<<<< HEAD:scripts/po/ChangeLog
-2007-09-20  Christian Perrier  <bubulle@debian.org>
-=======
 2007-09-23  Frank Lichtenheld  <djpig@debian.org>
 
        * dpkg-dev.pot: Regenerated.
        * *.po: Merged with dpkg-dev.pot.
 
-2007-08-30  Peter Karlsson  <peterk@debian.org>
->>>>>>> 482cc83e0404956b88767cde50f744e72c0e9516:scripts/po/ChangeLog
+2007-09-20  Christian Perrier  <bubulle@debian.org>
 
        * fr.po: Typo correcion