update conflic for pull master

2018-02-23 14:58:35 +06:30
parent 8069ac15ca 77a66d726b
commit ac47501e01
19 changed files with 284 additions and 125 deletions
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -1,6 +1,6 @@
-class HomeController < ApplicationController
+class HomeController < ApplicationController  
  # layout "application", except: [:index, :show]
-  skip_before_action :authenticate, only: [:index, :show, :create, :update, :destroy]  
+  # skip_before_action only: [:index, :show, :create, :update, :destroy]  

  def index
    # @employees = Employee.all_emp_except_waiter.order("name asc")