From 3eac7ff5269b52ac322fb2328802df5ca517bc1b Mon Sep 17 00:00:00 2001
From: Daniel Silverstone <dsilvers@digital-scurf.org>
Date: Sat, 4 Feb 2017 09:48:07 +0000
Subject: Initial setup content

---
 ikiwiki-bootstrap-theme/editcreationconflict.tmpl | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 ikiwiki-bootstrap-theme/editcreationconflict.tmpl

(limited to 'ikiwiki-bootstrap-theme/editcreationconflict.tmpl')

diff --git a/ikiwiki-bootstrap-theme/editcreationconflict.tmpl b/ikiwiki-bootstrap-theme/editcreationconflict.tmpl
new file mode 100644
index 0000000..c99102f
--- /dev/null
+++ b/ikiwiki-bootstrap-theme/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>
-- 
cgit v1.2.3