megred conflict
Merge pull request #27 from imme5150/update_discount_amount

Edit discount amount