X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/685475ba8c14fda5eb25a97ad2e2a7be3bb1e598..28055bbcc5c8e6371c7eaa7a0465a9e311a01764:/templates/editpage.tmpl
diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl
index d02eaad70..c1e7113b4 100644
--- a/templates/editpage.tmpl
+++ b/templates/editpage.tmpl
@@ -1,10 +1,20 @@
<TMPL_VAR FORM-TITLE>
+
+
+Your changes confict with other changes made to the page.
+
+
+Conflict markers have been inserted into the page content. Reconcile the
+confict and commit again to save your changes.
+
+
/
+
Page location:
@@ -17,10 +27,12 @@ Optional comment about this change:
-
+
Page preview:
+
+