X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/44eefb7f22d946c70429cdba7a6c90f6ffcbb6d3..ac7b1c32b1356dab71fd13d303d58d4bdb212941:/templates/editpage.tmpl diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index c23630dfa..ec48df4c2 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,25 +1,54 @@ + -<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:
+
 +
-
+
+Page preview: +
+
+
+ +