fix bad conflict resolution between ivan's and jeff's idea of how to use a different...
[freeside.git] / conf / invoice_from
1 ivan-unconfigured-freeside-installation@freeside.biz