remove conflict data

2018-03-05 16:24:45 +06:30
parent 4b311789e1 311bef4411
commit bd06e80b37
111 changed files with 3612 additions and 1386 deletions
--- a/app/controllers/base_waiter_controller.rb
+++ b/app/controllers/base_waiter_controller.rb
@@ -1,5 +1,5 @@
 class BaseWaiterController < ActionController::Base
-  include LoginVerification
+  include LoginVerification  
  layout "waiter"

  #before_action :check_installation
@@ -7,9 +7,8 @@ class BaseWaiterController < ActionController::Base

  helper_method :shop_detail

-  	#Shop Name in Navbor
-  	def shop_detail
-    	@shop = Shop.first
-  	end
-
+	#Shop Name in Navbor
+	def shop_detail
+		@shop = Shop.first
+	end
 end