fix conflicts in single_photo.tpl
authorAndreas Unterkircher <unki@netshadow.at>
Sun, 11 May 2008 07:29:45 +0000 (09:29 +0200)
committerAndreas Unterkircher <unki@netshadow.at>
Sun, 11 May 2008 07:29:45 +0000 (09:29 +0200)
commitb5ff85f75a27397c1ab4164fdefa9d734dc0e39d
tree7501a9d1c016b3e504ffaaa72ce8b10f6c820f36
parent50e939560cd42cd4355fc130cfea0389e380694f
parent43071ed9b32e3368aae01852abd70fa6b3afd877
fix conflicts in single_photo.tpl

Signed-off-by: Andreas Unterkircher <unki@netshadow.at>
themes/default/templates/single_photo.tpl