X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/fa96eab12016e2f29a0a3522f1229039fbbf2c5e..2d4d3ece1d1f1fa02c34a9849f03bbd9918177c5:/templates/editpage.tmpl diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index a5c44dc4c..f63a4b089 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -8,17 +8,17 @@ - +

-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.

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

- +