X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/56d0ceee2e9e324d78ed88d60d7bce108a0b32dd..a1e7197cd24bd1ba147656c03126b6abf02c0fd3:/templates/editpage.tmpl diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index b215d9df3..f63a4b089 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -7,15 +7,18 @@ <TMPL_VAR FORM-TITLE> + + +

-Your changes confict with other changes made to the page. +Your changes conflict 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. +conflict and commit again to save your changes.

@@ -38,7 +41,7 @@ Page type: Optional comment about this change:

- +