X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/685475ba8c14fda5eb25a97ad2e2a7be3bb1e598..66fbae3d8b38db7fa33cc85276ad5458e3a38936:/templates/editpage.tmpl diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index d02eaad70..f63a4b089 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,26 +1,57 @@ + -
+Your changes conflict with other changes made to the page. +
++Conflict markers have been inserted into the page content. Reconcile the +conflict and commit again to save your changes. +
+