X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/3c239b14bc84e33535cb8980fcdcf8ab5d1022eb..b39b92c0a602121daebe45e22cffb9a6711e54f2:/templates/editpage.tmpl diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index 6aa9ecd1c..4b54db2d1 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,33 +1,49 @@ - -
-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. -
-