From eec8cbc2e400740a18eb436c36377ee48943a8a7 Mon Sep 17 00:00:00 2001
From: Dan Winship <danw@src.gnome.org>
Date: Sat, 13 Oct 2001 17:30:58 +0000
Subject: remove a stray <<<<<<

svn path=/trunk/; revision=13659
---
 po/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

(limited to 'po/ChangeLog')

diff --git a/po/ChangeLog b/po/ChangeLog
index c0aa0503b4..ad0a30d075 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -22,7 +22,6 @@
 
 	* es.po: Updates Spanish trasnlation
 
->>>>>>> 1.693
 2001-10-12  Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>
 
 	* sk.po: Updated Slovak translation.
-- 
cgit v1.2.3