X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/44eefb7f22d946c70429cdba7a6c90f6ffcbb6d3..cf3021ef3f5cb839195585d601de76df519da510:/templates/editpage.tmpl?ds=sidebyside diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index c23630dfa..27155f5cf 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,25 +1,53 @@ + -<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: +
+
+