summaryrefslogtreecommitdiff
path: root/templates/editconflict.tmpl
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2009-04-23 16:14:35 -0400
committerJoey Hess <joey@gnu.kitenet.net>2009-04-23 16:14:35 -0400
commit860a86707856dcffcc67f137a0ab250ab34c42a6 (patch)
tree47a1c281467c6f5342f72b95250bf309692bad22 /templates/editconflict.tmpl
parente3ccf393c6081e413e1da0eae46ac937a032a13b (diff)
formatting
Diffstat (limited to 'templates/editconflict.tmpl')
0 files changed, 0 insertions, 0 deletions