X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/685475ba8c14fda5eb25a97ad2e2a7be3bb1e598..4286cbd5c21840a5d4ee5cc9330bbd71d5002ab2:/templates/editpage.tmpl diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index d02eaad70..1733483d3 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,26 +1,48 @@ + -
+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. +
+