X-Git-Url: https://scripts.mit.edu/gitweb/www/ikiwiki.git/blobdiff_plain/26213f8ee443addfbc74e92a693e172d023b16e6..2697ac99cf3bbc65f2183e07f688c1d93e2047f0:/templates/editpage.tmpl diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index 3b3570a44..cf4950ead 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,17 +1,3 @@ - - -
-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.