X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=templates%2Feditconflict.tmpl;fp=templates%2Feditconflict.tmpl;h=1252033952f9f86f4703b43b717d2774e390516e;hb=8f7f61590f3f01be17c9624ea3d28d7ea849d510;hp=0000000000000000000000000000000000000000;hpb=048c454849e6c7372dc794ba43a64c2678b078e8;p=mirror%2Fdsa-wiki.git

diff --git a/templates/editconflict.tmpl b/templates/editconflict.tmpl
new file mode 100644
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>