From: Christian Perrier <bubulle@debian.org>
Date: Sat, 8 Sep 2007 09:02:41 +0000 (+0200)
Subject: Sove the conflicts I probably created myself by ignorance
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2f19acb3b8c48c4d55073c017bfe7cc1843ee14f;p=dpkg

Sove the conflicts I probably created myself by ignorance
---

diff --git a/debian/changelog b/debian/changelog
index 89a60b67..51e7d328 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,13 +12,9 @@ dpkg (1.14.7) UNRELEASED; urgency=low
     Thanks to A. Costa.
 
   [ Updated dpkg translations ]
-<<<<<<< HEAD:debian/changelog
   * Portuguese (Miguel Figueiredo). Closes: #441113
-=======
->>>>>>> 317b4f1dcc46fc145ad651c1566e39422e716d9a:debian/changelog
   * German (Sven Joachim). Closes: #440537
   * Nepali (Shiva Prasad Pokharel). Closes: #437825
-  * Portuguese (Miguel Figueiredo).
   * Vietnamese (Clytie Siddall). Closes: #440502
   * Danish (Claus Hindsgaul). Closes: #441106
 
diff --git a/po/ChangeLog b/po/ChangeLog
index 43b9aded..3d97b579 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,12 +1,8 @@
-<<<<<<< HEAD:po/ChangeLog
 2007-09-07  Claus Hindsgaul  <claus.hindsgaul@gmail.com>
 
 	* da.po: Updated to 929t
 
-2007-09-06  Miguel Figueiredo <elmig@debianpt.org>
-=======
 2007-09-06  Miguel Figueiredo  <elmig@debianpt.org>
->>>>>>> 317b4f1dcc46fc145ad651c1566e39422e716d9a:po/ChangeLog
 
 	* pt.po: Updated to 929t.