]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/blob - templates/editconflict.tmpl
Have trail links at both beginning and end in the default templates
[git.ikiwiki.info.git] / templates / editconflict.tmpl
1 <p class="error">
2 <b>Your changes conflict with other changes made to the page.</b>
3 </p>
4 <p>
5 Conflict markers have been inserted into the page content. Reconcile the
6 conflict and commit again to save your changes.
7 </p>