From bf6ef763ff223184c540ea59a3ac0da200d2e3a9 Mon Sep 17 00:00:00 2001
From: Daichi Kawahata <daichi.k@aioros.ocn.ne.jp>
Date: Thu, 2 Mar 2006 13:38:13 +0000
Subject: [PATCH] Removed a bogus line.

(Old svn revision: 20165)
---
 po/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/po/ChangeLog b/po/ChangeLog
index 8b477da86..e0f59ce6a 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -50,7 +50,6 @@
 	  hu.po, it.po, ja.po, nl.po, pl.po, pt_BR.po, ru.po, sv.po:
 	  Update translations.
 
->>>>>>> .r20160
 2006-02-25  Stavros Giannouris <stavrosg2002@freemail.gr>
 
 	* el.po: Updated Greek translations
-- 
GitLab