X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/c20c4066311341e332dc425023f856b6414de9ae..5e6aae48fd777b8735f97b9473146903c8e204c3:/templates/editpage.tmpl diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index ec48df4c2..36076cb35 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,54 +1,67 @@ - - - - - - - -<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: +
+
+ +
+