From: Martin Kretzschmar <martink@src.gnome.org>
Date: Sat, 2 Jul 2005 15:08:14 +0000 (+0000)
Subject: Removed conflict markers from ChangeLog
X-Git-Tag: EVINCE_0_3_3~186
X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=commitdiff_plain;h=30ab21a355281cee3960062ab616ab8b4fa795ca;p=evince.git

Removed conflict markers from ChangeLog
---

diff --git a/po/ChangeLog b/po/ChangeLog
index 6a8867aa..4f3e15b5 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -294,7 +294,6 @@
 
 	* cs.po: Updated Czech translation.
 
->>>>>>> 1.143
 2005-04-08  Adam Weinberger  <adamw@gnome.org>
 
 	* en_CA.po: Updated Canadian English translation.