aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Winship <danw@src.gnome.org>2001-10-14 01:30:58 +0800
committerDan Winship <danw@src.gnome.org>2001-10-14 01:30:58 +0800
commiteec8cbc2e400740a18eb436c36377ee48943a8a7 (patch)
treee999897e9b92a193f9d179f872eb2a7cd747caab
parent6a19911ebadea2c4b8d2f0e33f89db94df894923 (diff)
downloadgsoc2013-evolution-eec8cbc2e400740a18eb436c36377ee48943a8a7.tar
gsoc2013-evolution-eec8cbc2e400740a18eb436c36377ee48943a8a7.tar.gz
gsoc2013-evolution-eec8cbc2e400740a18eb436c36377ee48943a8a7.tar.bz2
gsoc2013-evolution-eec8cbc2e400740a18eb436c36377ee48943a8a7.tar.lz
gsoc2013-evolution-eec8cbc2e400740a18eb436c36377ee48943a8a7.tar.xz
gsoc2013-evolution-eec8cbc2e400740a18eb436c36377ee48943a8a7.tar.zst
gsoc2013-evolution-eec8cbc2e400740a18eb436c36377ee48943a8a7.zip
remove a stray <<<<<<
svn path=/trunk/; revision=13659
-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.