X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/96eb9bb3fa1d805df967f44d13876f57b8ea121d..6a78214042372ae4a58c45fd1600ee55aa1f2892:/templates/editpage.tmpl
diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl
index ad1faa3a5..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.