X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/685475ba8c14fda5eb25a97ad2e2a7be3bb1e598..1334cc55ba522855bf5c7cd24febd70c6ac6fc23:/templates/editpage.tmpl diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index d02eaad70..68b7d1942 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,26 +1,69 @@ + -
+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. +
++Failed to save your changes. +
++Your changes were not able to be saved to disk. The system gave the error: +
++Your changes are preserved below, and you can try again to save them. + ++