From 779ef9a4ba4903738b76ba1a912580ece09f794e Mon Sep 17 00:00:00 2001 From: phyusin Date: Mon, 5 Mar 2018 16:26:19 +0630 Subject: [PATCH] remove conflict data --- app/controllers/home_controller.rb | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index cf18ae9b..df00e24c 100755 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -1,12 +1,8 @@ class HomeController < ApplicationController # layout "application", except: [:index, :show] -<<<<<<< HEAD skip_before_action :authenticate, only: [:index, :show, :create, :update, :destroy] helper_method :shop_detail -======= - # skip_before_action only: [:index, :show, :create, :update, :destroy] ->>>>>>> 311bef44119baa113cfadf226d6d34e04cfbe991 def index # @employees = Employee.all_emp_except_waiter.order("name asc")