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/en/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/en/conflict.txt')
-rw-r--r-- | lib/dokuwiki/inc/lang/en/conflict.txt | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/lib/dokuwiki/inc/lang/en/conflict.txt b/lib/dokuwiki/inc/lang/en/conflict.txt deleted file mode 100644 index 624f17b21..000000000 --- a/lib/dokuwiki/inc/lang/en/conflict.txt +++ /dev/null @@ -1,6 +0,0 @@ -====== A newer version exists ====== - -A newer version of the document you edited exists. This happens when another user changed the document while you were editing it. - -Examine the differences shown below thoroughly, then decide which version to keep. If you choose ''save'', your version will be saved. Hit ''cancel'' to keep the current version. - |