summaryrefslogtreecommitdiff
path: root/editconflict.tmpl
blob: ad3e6d86ee0471b612638ddd8465431486e72a1b (plain)
  1. ../shared/templates/editconflict.tmpl