aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosep Puigdemont i Casamajó <joseppc@src.gnome.org>2006-09-04 01:22:23 +0800
committerJosep Puigdemont i Casamajó <joseppc@src.gnome.org>2006-09-04 01:22:23 +0800
commit8ddfa79e4fd906f4b1cfe760d98eb09fc0d17e8b (patch)
tree9448ed2632349b616f427983ec1363817fb08bc5
parent3613e6b205bee6006d1eaa9bb159928d1cc01e29 (diff)
downloadgsoc2013-evolution-8ddfa79e4fd906f4b1cfe760d98eb09fc0d17e8b.tar.gz
gsoc2013-evolution-8ddfa79e4fd906f4b1cfe760d98eb09fc0d17e8b.tar.zst
gsoc2013-evolution-8ddfa79e4fd906f4b1cfe760d98eb09fc0d17e8b.zip
Removed conflict indicators.
svn path=/trunk/; revision=32727
-rw-r--r--po/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/po/ChangeLog b/po/ChangeLog
index 6ac01ca2f5..f004ec62ab 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1378,7 +1378,6 @@
* nb.po: Updated Norwegian bokmål translation.
* no.po: Same.
->>>>>>> 1.2514
2006-02-17 Vincent van Adrighem <adrighem@gnome.org>
* nl.po: Translation updated by Tino Meinen.