X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/26213f8ee443addfbc74e92a693e172d023b16e6..9fb18e3c6ff71385e814059b8c0092fa49dcdb38:/templates/editpage.tmpl diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index 3b3570a44..18e00849b 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,14 +35,11 @@ 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 +57,18 @@ Page type: Optional comment about this change:

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