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

Your changes conflict with other changes made to the page. @@ -49,15 +36,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 +59,30 @@ Page type: Optional comment about this change:

- + +Attachments + +
+ + + + + + + + +
+
+ +
Page preview:
-
+
- -