From 33e1b1aac8888beac570972b6c44ae88d3d7ec48 Mon Sep 17 00:00:00 2001
From: Nikos Charonitakis <frolix68@src.gnome.org>
Date: Tue, 13 Jan 2004 14:38:42 +0000
Subject: remove conflict indicators

---
 po/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

(limited to 'po')

diff --git a/po/ChangeLog b/po/ChangeLog
index fd31ecca5..d06fe44e2 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -39,7 +39,6 @@
 	* pt_BR.po: updated translation, by
 	  Joao Emanuel <deathbird1981@yahoo.com.br>
 
->>>>>>> 1.433
 2004-01-10  Danilo Šegan  <dsegan@gmx.net>
 
 	* sr.po, sr@Latn.po: Updated Serbian translation.
-- 
cgit