projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: fa5e374)
typos
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Wed, 15 Nov 2006 20:49:10 +0000 (20:49 +0000)
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Wed, 15 Nov 2006 20:49:10 +0000 (20:49 +0000)
templates/editpage.tmpl patch | blob | history

diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl
index ad1faa3a541540d2b629f315b8f12e5f897ba765..f63a4b08990f1d2e0f0cd053b5255aec2f29000d 100644 (file)
--- 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>
Ikiwiki is a compiler for VCS-based (Git, Subversion, ...) wikis.