aboutsummaryrefslogtreecommitdiff
path: root/mod/dokuwiki/vendors/dokuwiki/inc/lang/mg/conflict.txt
diff options
context:
space:
mode:
authorSem <sembrestels@riseup.net>2013-11-09 16:13:46 +0100
committerSem <sembrestels@riseup.net>2013-11-09 16:13:46 +0100
commite2a2fbdccaf0f48878903f448428cab5852d0870 (patch)
tree9cbe6b74c8e2e191ec65fba78d7435af35506f82 /mod/dokuwiki/vendors/dokuwiki/inc/lang/mg/conflict.txt
parent59448d8a9864573c05477a63a6dda404c455fdb6 (diff)
parentb603da53e13005c67d05efac67b70023dfffc450 (diff)
downloadelgg-e2a2fbdccaf0f48878903f448428cab5852d0870.tar.gz
elgg-e2a2fbdccaf0f48878903f448428cab5852d0870.tar.bz2
Add 'mod/dokuwiki/' from commit 'b603da53e13005c67d05efac67b70023dfffc450'
git-subtree-dir: mod/dokuwiki git-subtree-mainline: 59448d8a9864573c05477a63a6dda404c455fdb6 git-subtree-split: b603da53e13005c67d05efac67b70023dfffc450
Diffstat (limited to 'mod/dokuwiki/vendors/dokuwiki/inc/lang/mg/conflict.txt')
-rw-r--r--mod/dokuwiki/vendors/dokuwiki/inc/lang/mg/conflict.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/mg/conflict.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mg/conflict.txt
new file mode 100644
index 000000000..96b369e39
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mg/conflict.txt
@@ -0,0 +1,6 @@
+====== A newer version exists ======
+
+Efa misy kinova vaovao ny tahirin-kevitra novainao. Rehefa misy olona hafa nanova koa nandritra anao nanova no mitranga ny toy izao.
+
+Jereo ny tsy fitoviany miseho etsy ambany ireo, avy eo safidio izay kinova tianao hotazonina. Raha misafidy ny bokotra ''Raketo'' ianao, dia ny nataonao no horaketina. Ny bokotra ''Aoka ihany'' tsindriana raha hitazonana izay kinova misy ao.
+