fix bad conflict resolution between ivan's and jeff's idea of how to use a different...
[freeside.git] / FS / FS / part_pkg_discount.pm
2010-09-22 jeffprepayment discounts rt#5318