From 84b24bb78093106008157c05a7e4cfe0bb6f5fd1 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Thu, 14 Oct 2010 13:37:33 +0200
Subject: Sync with ikiwiki 3.20100926.

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

(limited to 'editcreationconflict.tmpl')

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