fixed conflict

2019-11-18 13:14:01 +06:30
parent 54ab9e0ca5 5702819b8b
commit 5dc93ef2f8
29 changed files with 1699 additions and 1183 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -533,6 +533,7 @@ scope "(:locale)", locale: /en|mm/ do
    resources :dailysale, :only => [:index, :show]
    resources :saleitem, :only => [:index, :show]
    resources :hourly_saleitem, :only => [:index, :show]
+    resources :staff_meal, :only => [:index, :show]
    resources :shiftsale, :only => [:index, :show]
    resources :credit_payment, :only => [:index, :show]
    resources :void_sale, :only => [:index, :show]