aboutsummaryrefslogtreecommitdiff
path: root/templates/editconflict.tmpl
blob: 1252033952f9f86f4703b43b717d2774e390516e (plain)
1
2
3
4
5
6
7
<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>