aboutsummaryrefslogtreecommitdiff
path: root/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/conflict.txt
diff options
context:
space:
mode:
Diffstat (limited to 'mod/dokuwiki/vendors/dokuwiki/inc/lang/en/conflict.txt')
-rw-r--r--mod/dokuwiki/vendors/dokuwiki/inc/lang/en/conflict.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/conflict.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/conflict.txt
new file mode 100644
index 000000000..624f17b21
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/conflict.txt
@@ -0,0 +1,6 @@
+====== 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.
+