fix conflict

config/routes.rb

@@ -114,6 +114,9 @@ scope "(:locale)", locale: /en|mm/ do
     post "request_bill" => "bill#request_bill"
     post "paymal_payment" => "payments#paymal_payment"
     get ":sale_id/void" => "void#overall_void"
+
+    #API for sync cloud
+    post 'sync_data' => 'sync#sync_data'
   end
 
   #--------- Cashier ------------#
@@ -538,7 +541,7 @@ scope "(:locale)", locale: /en|mm/ do
     get "induty/get_shift_by_date", to: "induty#show", as: "get_shift_by_induty"
     get "shiftsale_print/:id" , to: "shiftsale#print_close_receipt", as: "get_shift_id"
     post "print_sale_items", to: "saleitem#print_sale_items", as: "print_sale_items"
-
+    get "sync_data", to:'receipt_no#sync_data', as:'sync_data'
   end
 
   # ----------- Inventory ---------------------------