X-Git-Url: https://scripts.mit.edu/gitweb/www/ikiwiki.git/blobdiff_plain/3c239b14bc84e33535cb8980fcdcf8ab5d1022eb..e88a110d6204658e58efcccac363937ef67f4b3b:/templates/editpage.tmpl diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index 6aa9ecd1c..b1cf015a2 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,33 +1,50 @@ - -
-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. -
-