Add templates

[mirror/dsa-wiki.git] / templates / editconflict.tmpl

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