diff options
| author | sembrestels <sembrestels@riseup.net> | 2011-10-13 15:23:11 +0200 |
|---|---|---|
| committer | sembrestels <sembrestels@riseup.net> | 2011-10-13 15:23:11 +0200 |
| commit | 74bd6999c5e5c23ebbf90dbb6bdaabbddd7594cf (patch) | |
| tree | 834c120d692be288f261bcae169eedd3d6b31d74 /lib/dokuwiki/inc/lang/fo/conflict.txt | |
| parent | f8be8643f0faadb2c0ce87d553b7b9d569af5afd (diff) | |
| download | elgg-74bd6999c5e5c23ebbf90dbb6bdaabbddd7594cf.tar.gz elgg-74bd6999c5e5c23ebbf90dbb6bdaabbddd7594cf.tar.bz2 | |
Rename lib/dokuwiki to vendors/dokuwiki
Diffstat (limited to 'lib/dokuwiki/inc/lang/fo/conflict.txt')
| -rw-r--r-- | lib/dokuwiki/inc/lang/fo/conflict.txt | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/lib/dokuwiki/inc/lang/fo/conflict.txt b/lib/dokuwiki/inc/lang/fo/conflict.txt deleted file mode 100644 index df3fe52be..000000000 --- a/lib/dokuwiki/inc/lang/fo/conflict.txt +++ /dev/null @@ -1,5 +0,0 @@ -====== 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. |