X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/c20c4066311341e332dc425023f856b6414de9ae..9e0cbb73fe550d05e668d3584ef6f7981e781c8e:/templates/editpage.tmpl diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index ec48df4c2..4b54db2d1 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,36 +1,19 @@ - - -
--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. -
-