aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--po/ChangeLog1
1 files changed, 0 insertions, 1 deletions
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.