diff options
author | Dan Winship <danw@src.gnome.org> | 2001-10-14 01:30:58 +0800 |
---|---|---|
committer | Dan Winship <danw@src.gnome.org> | 2001-10-14 01:30:58 +0800 |
commit | eec8cbc2e400740a18eb436c36377ee48943a8a7 (patch) | |
tree | e999897e9b92a193f9d179f872eb2a7cd747caab /po/ChangeLog | |
parent | 6a19911ebadea2c4b8d2f0e33f89db94df894923 (diff) | |
download | gsoc2013-evolution-eec8cbc2e400740a18eb436c36377ee48943a8a7.tar.gz gsoc2013-evolution-eec8cbc2e400740a18eb436c36377ee48943a8a7.tar.zst gsoc2013-evolution-eec8cbc2e400740a18eb436c36377ee48943a8a7.zip |
remove a stray <<<<<<
svn path=/trunk/; revision=13659
Diffstat (limited to 'po/ChangeLog')
-rw-r--r-- | po/ChangeLog | 1 |
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. |