remove conflict

2018-07-16 10:58:12 +06:30
parent 416e7c19f3
commit 50f5094efc
1 changed files with 1 additions and 4 deletions
--- a/app/controllers/origami/master_controller.rb
+++ b/app/controllers/origami/master_controller.rb
@@ -79,11 +79,8 @@ class Origami::MasterController < BaseOrigamiController
        payment_for = true
      end
      sale_payment = SalePayment.new
-<<<<<<< HEAD
      @status, @sale = sale_payment.process_payment(saleObj, current_user.name, cash, "master",ref_no,payment_for)
-=======
-      @status, @sale = sale_payment.process_payment(saleObj, current_user.name, cash, "master",ref_no)
->>>>>>> 043a1efb2a59c3793b56184a342ba6d132cf57f9
+
    end
  end