X-Git-Url: https://scripts.mit.edu/gitweb/www/ikiwiki.git/blobdiff_plain/1452b3adf30145e8fd1208ac73da9d12967863bc..eb8d06b3b61b8a9099fd6782b322880b6fc6013a:/templates/editpage.tmpl diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index cf4520575..118ca4550 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,53 +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 +
+ + + + + + + + +
+
+ + +
Page preview:
-
+
- - + +
+
+Diff: +
+
+ +
+