From 7ce46295b87839f0c16adeca66e687ee18a917db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Perell=C3=B3=20Mar=C3=ADn?= <carlos@src.gnome.org>
Date: Tue, 4 Sep 2001 15:54:21 +0000
Subject: Removed >>>

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

diff --git a/po/ChangeLog b/po/ChangeLog
index 73e32f902a..f73fcb264c 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -44,7 +44,6 @@
 
 	* no.po: Updated Norwegian (bokmål) translation.
 	
->>>>>>> 1.618
 2001-08-28  Christophe Merlet  <redfox@eikonex.org>
 
 	* fr.po: Updated French translation from contribution of
-- 
cgit v1.2.3