update conflic

app/models/assigned_order_item.rb

@@ -8,10 +8,6 @@ class AssignedOrderItem < ApplicationRecord
   belongs_to :order_queue_station
 
   def self.assigned_order_item (order, item_code, instance_code, order_queue_station )
-<<<<<<< HEAD
-    AssignedOrderItem.transaction do
-=======
->>>>>>> 146f727f462174b1daa31972b597448c12e26d8c
       assigned_order_item = AssignedOrderItem.new()
       assigned_order_item.order = order
       assigned_order_item.item_code = item_code
@@ -20,10 +16,6 @@ class AssignedOrderItem < ApplicationRecord
       assigned_order_item.print_status = false
       assigned_order_item.delivery_status = false
       assigned_order_item.save!
-<<<<<<< HEAD
-    end
-=======
->>>>>>> 146f727f462174b1daa31972b597448c12e26d8c
   end
 
   def self.assigned_order_item_by_job(order_id)

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