fix conflict in phpfspot_tmpl.php
authorAndreas Unterkircher <unki@netshadow.at>
Sat, 12 Apr 2008 16:30:10 +0000 (18:30 +0200)
committerAndreas Unterkircher <unki@netshadow.at>
Sat, 12 Apr 2008 16:30:10 +0000 (18:30 +0200)
commitb583a04ebad60d02349b78f8c38353e0cb3eb9ea
tree3e54da2054b8b29ef42a136474efd7d91e3bb677
parent1bd68ab30d8e8a95581ff26da1f8fadf12ce5d8d
parent9b5884120e78b7e2ce35d37bdb72da7ec721452d
fix conflict in phpfspot_tmpl.php

Signed-off-by: Andreas Unterkircher <unki@netshadow.at>
phpfspot_tmpl.php