From: joey Date: Wed, 15 Nov 2006 20:49:10 +0000 (+0000) Subject: typos X-Git-Tag: 1.33~1 X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=commitdiff_plain;h=1626831cc85307682610e58f4bca2a4b7c583024 typos --- 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.