X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/26213f8ee443addfbc74e92a693e172d023b16e6..edfbd7e1aa8f9f2cb789f45c0668a0d987e0b368:/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 @@ - - -
-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.