X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/1d82816082b2a3dee97a1812410962a41f1b6e79..dc0d48459cfc0dc53301b87c2fc98216f4dcca06:/templates/editpage.tmpl diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index c1e7113b4..118ca4550 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,38 +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:

+
+
+Page preview: +
+
- - +
+ + +
+
+Diff: +
+
+ +
 - -