X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/685475ba8c14fda5eb25a97ad2e2a7be3bb1e598..c5b02885e934e5a1f8c5a8753ed47eaf4cce8b9f:/templates/editpage.tmpl diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index d02eaad70..1ee4c4947 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,26 +1,55 @@ + -<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: +Page type: +
+ -
+
-Optional comment about this change:
-
+Optional comment about this change:
+
 + -
-

Page preview:

+
+
+Page preview: +
+
+