aboutsummaryrefslogtreecommitdiffstats
path: root/po/ChangeLog
diff options
context:
space:
mode:
authorCarlos Perelló Marín <carlos@src.gnome.org>2001-09-04 23:54:21 +0800
committerCarlos Perelló Marín <carlos@src.gnome.org>2001-09-04 23:54:21 +0800
commit7ce46295b87839f0c16adeca66e687ee18a917db (patch)
tree6c087af1766ce0761f1b10515ba2753965b649e0 /po/ChangeLog
parenta6e026a2a558d9d463cfc6df9d6434b2348c2854 (diff)
downloadgsoc2013-evolution-7ce46295b87839f0c16adeca66e687ee18a917db.tar
gsoc2013-evolution-7ce46295b87839f0c16adeca66e687ee18a917db.tar.gz
gsoc2013-evolution-7ce46295b87839f0c16adeca66e687ee18a917db.tar.bz2
gsoc2013-evolution-7ce46295b87839f0c16adeca66e687ee18a917db.tar.lz
gsoc2013-evolution-7ce46295b87839f0c16adeca66e687ee18a917db.tar.xz
gsoc2013-evolution-7ce46295b87839f0c16adeca66e687ee18a917db.tar.zst
gsoc2013-evolution-7ce46295b87839f0c16adeca66e687ee18a917db.zip
Removed >>>
svn path=/trunk/; revision=12583
Diffstat (limited to 'po/ChangeLog')
-rw-r--r--po/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/po/ChangeLog b/po/ChangeLog
index 73e32f902a..f73fcb264c 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -44,7 +44,6 @@
* no.po: Updated Norwegian (bokmål) translation.
->>>>>>> 1.618
2001-08-28 Christophe Merlet <redfox@eikonex.org>
* fr.po: Updated French translation from contribution of