summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Mastrukov <dmitrym@src.gnome.org>2002-11-09 05:19:02 +0000
committerDmitry Mastrukov <dmitrym@src.gnome.org>2002-11-09 05:19:02 +0000
commit71bd7f135a2a4cf6bad25b39f47a741d9a59051c (patch)
tree773688643602802b7a44d2c127d1a5cf61784cab
parente6fe62b35d30f8f5ee02821e1293ee0af3666c81 (diff)
downloadgconf-71bd7f135a2a4cf6bad25b39f47a741d9a59051c.tar.gz
Fix ChangeLog addition
-rw-r--r--po/ChangeLog8
1 files changed, 0 insertions, 8 deletions
diff --git a/po/ChangeLog b/po/ChangeLog
index 3268764c..5d53cecc 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -3,18 +3,10 @@
* be.po: Updated Belarusian translation
* from Belarusian team <i18n@infonet.by>.
-<<<<<<< ChangeLog
-2002-11-09 Dmitry G. Mastrukov <dmitry@taurussoft.org>
-
- * be.po: Updated Belarusian translation
- * from Belarusian team <i18n@infonet.by>.
-
-=======
2002-11-17 Daniel Yacob <locales@geez.org>
* am.po: Added Amharic translation.
->>>>>>> 1.271.2.4
2002-11-04 Simos Xenitellis <simos74@gmx.net>
* el.po: Updated Greek translation from Kostas Papadimas