diff options
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. - |