Removed conflict markers from ChangeLog

diff --git a/po/ChangeLog b/po/ChangeLog
index 6a8867aa91a4d3d7bdc53f1ea9cc352d6a2ec9c2..4f3e15b548e5a5e02fd1672a3be199412d95472c 100644 (file)
--- 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.