From 29355a1653a12742928ce563e4c077a77f67c9f9 Mon Sep 17 00:00:00 2001
From: root <root@piny.svcs.cs.pdx.edu>
Date: Sun, 6 Sep 2009 04:26:13 -0700
Subject: Import of unversioned piny code.

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

(limited to 'srv/templates/editconflict.tmpl')

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