From 242c50b9298e86069176e12417a3f364eb595321 Mon Sep 17 00:00:00 2001
From: Jordi Mallach <jordim@src.gnome.org>
Date: Mon, 7 Feb 2005 13:12:51 +0000
Subject: Remove bogus conflict marker.

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

diff --git a/po/ChangeLog b/po/ChangeLog
index 37021ea9a..060ef17b1 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -199,7 +199,6 @@
 
 	* de.po: Fixed/added translations with context marker.
 
->>>>>>> 1.960
 2005-01-18  Frank Arnold  <farnold@cvs.gnome.org>
 
 	* de.po: Updated German translation.
-- 
cgit v1.2.3