fixed conflict

2017-06-06 09:47:33 +06:30
parent 0cc378f318 64f5dd65bd
commit eaec6a39b4
36 changed files with 472 additions and 177 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -114,7 +114,7 @@ Rails.application.routes.draw do
    #menu
    resources :menus do
      #menu_categories
-      resources :menu_categories, only: [:new, :create, :edit]
+      resources :menu_categories, only: [:new, :create, :edit,:delete]
    end

    #accounts