git.vanrenterghem.biz Git - git.ikiwiki.info.git/blob - templates/editconflict.tmpl

]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/blob - templates/editconflict.tmpl

projects / git.ikiwiki.info.git / blob

summary | shortlog | log | commit | commitdiff | tree
history | raw | HEAD

[git.ikiwiki.info.git] / templates / editconflict.tmpl

 <p class="error">
 <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
 conflict and commit again to save your changes.
 </p>

Unnamed repository; edit this file 'description' to name the repository.