update conflict file

config/routes.rb

@@ -80,6 +80,7 @@ Rails.application.routes.draw do
     post 'moving' => "movetable#moving"
     get "/table/:table_id/sale/:sale_id/edit" => "sale_edit#edit"
     post 'item_void' => "sale_edit#item_void"
+    post 'item_edit' => "sale_edit#item_edit"
     post 'item_void_cancel' => "sale_edit#item_void_cancel"
     post 'cancel_all_void' => 'sale_edit#cancel_all_void'
     post 'apply_void' => 'sale_edit#apply_void'
@@ -109,7 +110,7 @@ Rails.application.routes.draw do
     #---------Shift ---------------#
     resources :shifts, only: [:index, :new, :create, :edit]
     post 'close_shift' => 'shifts#update_shift'
-    get 'shift/close' => 'shifts#show' 
+    get 'shift/close' => 'shifts#show'
     #shift - index (open/close shift landing page)
     #shift - show (sales summary display)
     #shift - new (open shift)
@@ -121,6 +122,7 @@ Rails.application.routes.draw do
     #payment - Outing payments - Cash only [ *Misc expeness tracking]
 
     #--------- Payment ------------#
+    post 'sale/:sale_id/rounding_adj' => 'payments#rounding_adj',:as => "calculate_rouding_adjs"
     get 'sale/:sale_id/first_bill' => 'payments#first_bill', :defaults => { :format => 'json' }
     get 'sale/:sale_id/payment' => 'payments#show'
 

config/schedule.rb

@@ -0,0 +1,7 @@
+set :environment, "development"
+env :PATH, ENV['PATH']
+set :output, 'log/whenever.log'
+
+every 30.minutes do
+  runner "Customer.update_membership"
+end