X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/5591d621b90855beeb5460f0ac11279d19835699..09793a2aafe3cdb153d5a202c09d8b6fedfab406:/templates/editpage.tmpl diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index 1733483d3..118ca4550 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,48 +1,65 @@ - - - - -<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:
    +
  1. + + +
    2. +     -
    +
  2. +
    +
    3. -Optional comment about this change:
    +
  3. +
    +
    4.  +
+ + +Attachments +
+ + + + + + + + +
+
+ -
+ + -