update conflic

2018-07-11 10:07:50 +06:30
parent 441f37ba8a
commit cd42b1136e
2 changed files with 0 additions and 16 deletions
--- a/app/models/sale_order.rb
+++ b/app/models/sale_order.rb
@@ -8,18 +8,10 @@ class SaleOrder < ApplicationRecord
  belongs_to :order

  def create_sale_order(sale, order) 
-<<<<<<< HEAD
-    SaleOrder.transaction do
-=======
->>>>>>> 146f727f462174b1daa31972b597448c12e26d8c
      sale_order = SaleOrder.new
      sale_order.sale_id = sale
      sale_order.order_id = order
      sale_order.save!
-<<<<<<< HEAD
-    end
-=======
->>>>>>> 146f727f462174b1daa31972b597448c12e26d8c
  end

  private