Photos
Blog
Projects
vanrenterghem.biz
projects
/
git.ikiwiki.info.git
/ blob
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
history
|
raw
|
HEAD
what went wrong this time? whether it's useful
[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>