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.

---
 editconflict.tmpl | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 editconflict.tmpl

(limited to 'editconflict.tmpl')

diff --git a/editconflict.tmpl b/editconflict.tmpl
new file mode 100644
index 0000000..1252033
--- /dev/null
+++ b/editconflict.tmpl
@@ -0,0 +1,7 @@
+<p class="error">
+<b>Your changes conflict with other changes made to the page.</b>
+</p>
+<p>
+Conflict markers have been inserted into the page content. Reconcile the
+conflict and commit again to save your changes.
+</p>
-- 
cgit v1.2.3