diff options
| author | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-11-15 20:49:10 +0000 |
|---|---|---|
| committer | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-11-15 20:49:10 +0000 |
| commit | 1626831cc85307682610e58f4bca2a4b7c583024 (patch) | |
| tree | daf1da4b03ac8aafa256eb2f226161cb2000ed9d /templates | |
| parent | fa5e3745ac0c819c117b065d6e499104c2149175 (diff) | |
| download | ikiwiki-1626831cc85307682610e58f4bca2a4b7c583024.tar ikiwiki-1626831cc85307682610e58f4bca2a4b7c583024.tar.gz | |
typos
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/editpage.tmpl | 4 |
1 files changed, 2 insertions, 2 deletions
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 @@ <body> <TMPL_IF NAME="PAGE_CONFLICT"> <p> -<b>Your changes confict with other changes made to the page.</b> +<b>Your changes conflict with other changes made to the page.</b> </p> <p> 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. </p> </TMPL_IF> <TMPL_VAR FORM-START> |