summaryrefslogtreecommitdiff
path: root/templates/editconflict.tmpl
blob: 1252033952f9f86f4703b43b717d2774e390516e (plain)
  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>