remove conflict data

2018-03-05 16:26:19 +06:30
parent bd06e80b37
commit 779ef9a4ba
1 changed files with 0 additions and 4 deletions
--- 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")