X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/798c48a1a6ec32274ba031660bdd3eeef462e468..1a8beaf4c6f09ee693bdc9447f74b21512509190:/templates/editpage.tmpl?ds=sidebyside diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index 8b755749f..6030fa2c1 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,21 +1,57 @@ + -<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: +
+
+ +
+