urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

typos

master
joey 2006-11-15 20:49:10 +00:00
parent fa5e3745ac
commit 1626831cc8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
templates/editpage.tmpl
View File

@ -14,11 +14,11 @@
<body> <body>
<TMPL_IF NAME="PAGE_CONFLICT"> <TMPL_IF NAME="PAGE_CONFLICT">
<p> <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>
<p> <p>
Conflict markers have been inserted into the page content. Reconcile the 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> </p>
</TMPL_IF> </TMPL_IF>
<TMPL_VAR FORM-START> <TMPL_VAR FORM-START>