X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/26213f8ee443addfbc74e92a693e172d023b16e6..e87c3ae6df9a8abc49879851a1c70a41c49176ed:/templates/editpage.tmpl diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index 3b3570a44..36b616f5b 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,17 +1,3 @@ - - - - - -<TMPL_VAR FORM-TITLE> - - - - - - -

Your changes conflict with other changes made to the page. @@ -49,15 +35,13 @@ with the same name.

The edit box below contains the page's current content, followed by the -content you entered previously, to allow you to merge the two contents +content you entered previously, to allow you to merge the two together before saving.

-
-/ -
+ @@ -74,17 +58,21 @@ Page type: Optional comment about this change:

- + + +

+Attach a file: +

+ +
Page preview:
-
+
- -