X-Git-Url: https://scripts.mit.edu/gitweb/www/ikiwiki.git/blobdiff_plain/b187641376a3d0519005c80c1ef0dd19266dda84..d9d910f6765de6ba07508ab56a5a0f93edb4c8ad:/templates/editpage.tmpl diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index 1ee4c4947..6d8a902a2 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,32 +1,13 @@ - - -
--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. -
-