From 30ab21a355281cee3960062ab616ab8b4fa795ca Mon Sep 17 00:00:00 2001
From: Martin Kretzschmar <martink@src.gnome.org>
Date: Sat, 02 Jul 2005 15:08:14 +0000
Subject: Removed conflict markers from ChangeLog

---
diff --git a/po/ChangeLog b/po/ChangeLog
index 6a8867a..4f3e15b 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.
--
cgit v0.9.1