about summary refs log tree commit diff stats
path: root/wiki/inc/lang/mg/conflict.txt
diff options
context:
space:
mode:
authorahriman <ahriman@falte.red>2019-01-02 04:57:35 +0000
committerahriman <ahriman@falte.red>2019-01-02 04:57:35 +0000
commit2bd7f83a6495011ada78ca8a9f2af417caf01760 (patch)
treef9acdb7f09e011c65330ab993d4db3620787dbfb /wiki/inc/lang/mg/conflict.txt
parentbcb215c3a7e914d05f166846a33860e48bba64fb (diff)
downloadsite-2bd7f83a6495011ada78ca8a9f2af417caf01760.tar.gz
removed dokuwiki
Diffstat (limited to 'wiki/inc/lang/mg/conflict.txt')
-rw-r--r--wiki/inc/lang/mg/conflict.txt6
1 files changed, 0 insertions, 6 deletions
diff --git a/wiki/inc/lang/mg/conflict.txt b/wiki/inc/lang/mg/conflict.txt
deleted file mode 100644
index 96b369e..0000000
--- a/wiki/inc/lang/mg/conflict.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-====== 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.
-