fix bad conflict resolution between ivan's and jeff's idea of how to use a different...
[freeside.git] / httemplate / images / red_telephone_mimooh_01.png
httemplate/images/red_telephone_mimooh_01.png