X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/685475ba8c14fda5eb25a97ad2e2a7be3bb1e598..3b0fce93e40e5457b63ceda9692901539eb4fc82:/templates/editpage.tmpl diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index d02eaad70..4724cd65f 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,26 +1,51 @@ + -<TMPL_VAR FORM-TITLE> + + + + + +<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:
+Page location:
-
+
-Optional comment about this change:
-
+Optional comment about this change:
+
+
-
+ +
+
+ +