From 0ff21a88cd78b4096ee9bc6019c457dbe0fbbae7 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Mon, 28 May 2018 10:52:51 +0630
Subject: [PATCH] remove conflict

---
 app/models/order_queue_station.rb | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/app/models/order_queue_station.rb b/app/models/order_queue_station.rb
index f002a02b..3a69fe62 100755
--- a/app/models/order_queue_station.rb
+++ b/app/models/order_queue_station.rb
@@ -220,13 +220,10 @@ class OrderQueueStation < ApplicationRecord
           unique_code="OrderSummarySetPdf"
         elsif printer_setting.unique_code == 'OrderSummaryCustomisePdf'
           unique_code="OrderSummaryCustomisePdf"
-<<<<<<< HEAD
         elsif printer_setting.unique_code == 'OrderSummarySetCustomisePdf'
           unique_code="OrderSummarySetCustomisePdf"  
-=======
         elsif printer_setting.unique_code == 'OrderSummarySlimCustomisePdf'
           unique_code="OrderSummarySlimCustomisePdf"
->>>>>>> 7ddbd7d78a644d6f6bd2c0bffab1a46f69bae23c
         end  
       end
     end 
@@ -258,13 +255,10 @@ class OrderQueueStation < ApplicationRecord
           unique_code="OrderSetItemPdf"
         elsif printer_setting.unique_code == 'OrderItemCustomisePdf'
           unique_code="OrderItemCustomisePdf"
-<<<<<<< HEAD
         elsif printer_setting.unique_code == 'OrderSetItemCustomisePdf'
           unique_code="OrderSetItemCustomisePdf"  
-=======
         elsif printer_setting.unique_code == 'OrderItemSlimCustomisePdf'
           unique_code="OrderItemSlimCustomisePdf"
->>>>>>> 7ddbd7d78a644d6f6bd2c0bffab1a46f69bae23c
         end  
       end
     end