X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=templates%2Feditcreationconflict.tmpl;fp=templates%2Feditcreationconflict.tmpl;h=c99102f0d7af064235c1dc465751742c9ec11004;hb=8f7f61590f3f01be17c9624ea3d28d7ea849d510;hp=0000000000000000000000000000000000000000;hpb=048c454849e6c7372dc794ba43a64c2678b078e8;p=mirror%2Fdsa-wiki.git

diff --git a/templates/editcreationconflict.tmpl b/templates/editcreationconflict.tmpl
new file mode 100644
index 0000000..c99102f
--- /dev/null
+++ b/templates/editcreationconflict.tmpl
@@ -0,0 +1,9 @@
+<p class="error">
+<b>While you were creating this page, someone else independently created a page
+with the same name.</b>
+</p>
+<p>
+The edit box below contains the page's current content, followed by the
+content you entered previously, to allow you to merge the two
+together before saving.
+</p>