X-Git-Url: https://scripts.mit.edu/gitweb/www/ikiwiki.git/blobdiff_plain/56d0ceee2e9e324d78ed88d60d7bce108a0b32dd..759becd40c39344a1cb2564ca58ad1b753e504c4:/templates/editpage.tmpl diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index b215d9df3..b1cf015a2 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,30 +1,12 @@ - - -
--Your changes confict with other changes made to the page. -
--Conflict markers have been inserted into the page content. Reconcile the -confict and commit again to save your changes. -
-