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