From 8ddfa79e4fd906f4b1cfe760d98eb09fc0d17e8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josep=20Puigdemont=20i=20Casamaj=C3=B3?=
 <joseppc@src.gnome.org>
Date: Sun, 3 Sep 2006 17:22:23 +0000
Subject: Removed conflict indicators.

svn path=/trunk/; revision=32727
---
 po/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

(limited to 'po')

diff --git a/po/ChangeLog b/po/ChangeLog
index 6ac01ca2f5..f004ec62ab 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1378,7 +1378,6 @@
 	* nb.po: Updated Norwegian bokmål translation.
 	* no.po: Same.
 
->>>>>>> 1.2514
 2006-02-17  Vincent van Adrighem  <adrighem@gnome.org>
 
 	* nl.po: Translation updated by Tino Meinen.
-- 
cgit v1.2.3