X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/3c239b14bc84e33535cb8980fcdcf8ab5d1022eb..bd1eb38ed8f0e0621000dc9d597967b9ad82d995:/templates/editpage.tmpl?ds=sidebyside diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index 6aa9ecd1c..b215d9df3 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,33 +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: +Page type: +
+ -
+
-Optional comment about this change:
-
+Optional comment about this change:
+
 + -
-

Page preview:

+
+
+Page preview: +
+
+