X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/44eefb7f22d946c70429cdba7a6c90f6ffcbb6d3..cedb48765b52d3e074f43703cf55611b3bce101d:/templates/editpage.tmpl diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index c23630dfa..1ee4c4947 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,25 +1,55 @@ + -
+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. +
+