repo.or.cz
/
ikiwiki.git
/
blob
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
blame
|
history
|
raw
|
HEAD
pimp Libravatar too
[ikiwiki.git]
/
templates
/
editconflict.tmpl
blob
1252033952f9f86f4703b43b717d2774e390516e
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>