X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/96eb9bb3fa1d805df967f44d13876f57b8ea121d..b91ccb4963fe7074b64cb538a2439d4cb9dad45e:/templates/editpage.tmpl diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index ad1faa3a5..b1cf015a2 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,33 +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. -
-