X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/b187641376a3d0519005c80c1ef0dd19266dda84..a58c3cfcbfcfc3f6d660642b187e61aa75472e6f:/templates/editpage.tmpl diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index 1ee4c4947..70bbfb28f 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,55 +1,69 @@ - - - - - - - -<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 type: + + -
 +

+
-Optional comment about this change:
-
+ +
 + +Attachments +
+ + + + + + + + +
+
+ +
+

By submitting content to this wiki, you agree to release your work under + the dual license of

+
    +
  • the Creative Commons Attribution-Share Alike license, and
    • +
  • the GNU Free Documentation License, with no Invariant Sections, no + Front-Cover Texts, and no Back-Cover-Texts.
    • +
+
+ +
Page preview:
-
+
- - + +
+
+Diff: +
+
+ +
+