summaryrefslogtreecommitdiff
path: root/templates/editconflict.tmpl
diff options
context:
space:
mode:
authorhttp://www.cse.unsw.edu.au/~willu/ <http://www.cse.unsw.edu.au/~willu/@web>2008-08-05 07:06:16 -0400
committerJoey Hess <joey@kitenet.net>2008-08-05 07:06:16 -0400
commit78cf90361021e2782085bdbd5a34c2358f811445 (patch)
tree54cae31d1e6635a06b140969f4c9d137c590c178 /templates/editconflict.tmpl
parentea7bcf64721ffe2438a862607faef90b904fbc91 (diff)
Add note on work-around
Diffstat (limited to 'templates/editconflict.tmpl')
0 files changed, 0 insertions, 0 deletions