X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/fb670513bf2372a6a88e5a5bc15eacfe4b88bf35..71a63b1b1350e2faa8d3f62dc9c9a3167998c9e0:/templates/editpage.tmpl diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index 6030fa2c1..f63a4b089 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -14,11 +14,11 @@

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

- +