summaryrefslogtreecommitdiff
path: root/platform/www/inc/lang/en/conflict.txt
diff options
context:
space:
mode:
Diffstat (limited to 'platform/www/inc/lang/en/conflict.txt')
-rw-r--r--platform/www/inc/lang/en/conflict.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/platform/www/inc/lang/en/conflict.txt b/platform/www/inc/lang/en/conflict.txt
new file mode 100644
index 0000000..2586a2a
--- /dev/null
+++ b/platform/www/inc/lang/en/conflict.txt
@@ -0,0 +1,5 @@
+====== 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.