fixed conflict

2019-11-28 14:19:37 +06:30
parent b45c376ebc 2010b6a4bb
commit f035c2fe10
90 changed files with 3237 additions and 3284 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -532,6 +532,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]