remove conflict

2018-07-16 10:59:20 +06:30
parent 24afc555b1 50f5094efc
commit 5b4ca6bf20
1 changed files with 1 additions and 0 deletions
--- a/app/controllers/origami/master_controller.rb
+++ b/app/controllers/origami/master_controller.rb
@@ -80,6 +80,7 @@ class Origami::MasterController < BaseOrigamiController
      end
      sale_payment = SalePayment.new
      @status, @sale = sale_payment.process_payment(saleObj, current_user.name, cash, "master",ref_no,payment_for)
+
    end
  end