summaryrefslogtreecommitdiff
path: root/templates/editconflict.tmpl
diff options
context:
space:
mode:
authorhttp://smcv.pseudorandom.co.uk/ <smcv@web>2010-09-26 21:53:54 +0000
committerJoey Hess <joey@kitenet.net>2010-09-26 21:53:54 +0000
commit9d634e97d2f359db65883aadfb941309a53a0bc8 (patch)
tree91c29de1a130f1d9874a1c0c190520181668d04a /templates/editconflict.tmpl
parent58c80f8ed1d0dea5e03bc566769522c558353ab8 (diff)
sign my change
Diffstat (limited to 'templates/editconflict.tmpl')
0 files changed, 0 insertions, 0 deletions