summaryrefslogtreecommitdiff
path: root/templates/editconflict.tmpl
diff options
context:
space:
mode:
authorJon Dowland <jmtd@debian.org>2009-10-24 17:23:52 +0100
committerJon Dowland <jmtd@debian.org>2009-10-24 17:23:52 +0100
commit118058f0f530f0171fb625815aa0aae992e3f4b6 (patch)
treec022213fa6cc18e098b17e234e25be2f7ab7d7d2 /templates/editconflict.tmpl
parentb474e61eee26c5f0f7c9537562a9d6c2be0ad68f (diff)
give up and just inline the patch again
Diffstat (limited to 'templates/editconflict.tmpl')
0 files changed, 0 insertions, 0 deletions