X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/cf3021ef3f5cb839195585d601de76df519da510..659629ed21ab2e852b2f4fe4402dfe8cf6b7660b:/templates/editpage.tmpl?ds=inline diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index 27155f5cf..f63a4b089 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -6,15 +6,19 @@ <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.

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

- +