diff options
| author | Sem <sembrestels@riseup.net> | 2013-11-09 16:13:46 +0100 |
|---|---|---|
| committer | Sem <sembrestels@riseup.net> | 2013-11-09 16:13:46 +0100 |
| commit | e2a2fbdccaf0f48878903f448428cab5852d0870 (patch) | |
| tree | 9cbe6b74c8e2e191ec65fba78d7435af35506f82 /mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/conflict.txt | |
| parent | 59448d8a9864573c05477a63a6dda404c455fdb6 (diff) | |
| parent | b603da53e13005c67d05efac67b70023dfffc450 (diff) | |
| download | elgg-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/fo/conflict.txt')
| -rw-r--r-- | mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/conflict.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/conflict.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/conflict.txt new file mode 100644 index 000000000..df3fe52be --- /dev/null +++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/conflict.txt @@ -0,0 +1,5 @@ +====== Ein níggjari útgáva av skjalinum er til ====== + +Ein nýggjari útgáva av hesum skjalinum er til. Hetta hendur tá fleiri brúkarir rætta í skjalinum samstundis. + +Eftirkanna tær vístu broytingar nágreiniliga, og avgerð hvat fyri útgávu sum skal goymast. Um tú velur ''Goym'', verður tín útgáva av skalinum goymd. Velur tú ''Angra'' varðveittur tú tí núverandi útgávuna. |