From 07d95556ecc863d969e4c9ac09d398c55c37b082 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sat, 15 Sep 2007 07:50:12 +0300
Subject: [PATCH] Cleanup merge detritus and changelog formatting

---
 debian/changelog | 15 ++++++---------
 po/ChangeLog     |  4 ++--
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2893b1b0..9d804acd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,16 +16,18 @@ dpkg (1.14.7) UNRELEASED; urgency=low
     Thanks to Brian M. Carlson.
 
   [ Updated dpkg translations ]
-  * Portuguese (Miguel Figueiredo). Closes: #441113
+  * Basque (Piarres Beobide). Closes: #440859
+  * Danish (Claus Hindsgaul). Closes: #441106
+  * French (Frédéric Bothamy).
   * German (Sven Joachim). Closes: #440537
   * Nepali (Shiva Prasad Pokharel). Closes: #437825
-  * Vietnamese (Clytie Siddall). Closes: #440502
-  * Danish (Claus Hindsgaul). Closes: #441106
+  * Portuguese (Miguel Figueiredo). Closes: #441113
   * Romanian (Eddy Petrișor).
+  * Vietnamese (Clytie Siddall). Closes: #440502
 
   [ Updated man pages translations ]
-  * Swedish (Peter Karlsson).
   * German (Helge Kreutzmann).
+  * Swedish (Peter Karlsson).
 
  -- Guillem Jover <guillem@debian.org>  Thu, 06 Sep 2007 03:42:40 +0300
 
@@ -84,15 +86,10 @@ dpkg (1.14.6) unstable; urgency=low
 
   [ Updated dpkg translations ]
   * Dzongkha (Tshewang Norbu). Closes: #430931
-  * French (Frédéric Bothamy).
-<<<<<<< HEAD:debian/changelog
-  * Basque (Piarres Beobide). Closes: #440859
-=======
   * Nepali (Shiva Prasad Pokharel). Closes: #435353
   * Polish (Robert Luberda).
   * Russian (Yuri Kozlov). Closes: #436147
   * Swedish (Peter Karlsson).
->>>>>>> 3f0020be7eac8357f5ce53f978b63f1fd4181be2:debian/changelog
 
   [ Updated dselect translations ]
   * Russian (Yuri Kozlov). Closes: #436149
diff --git a/po/ChangeLog b/po/ChangeLog
index 3d97b579..d977e6c5 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,6 +1,6 @@
 2007-09-07  Claus Hindsgaul  <claus.hindsgaul@gmail.com>
 
-	* da.po: Updated to 929t
+	* da.po: Updated to 929t.
 
 2007-09-06  Miguel Figueiredo  <elmig@debianpt.org>
 
@@ -8,7 +8,7 @@
 
 2007-09-05  Piarres Beobide  <pi@beobide.net>
 
-	* eu.po: Updated to 929t
+	* eu.po: Updated to 929t.
 
 2007-09-04  Frédéric Bothamy  <frederic.bothamy@free.fr>
 
-- 
2.39.5