remove conflict data

app/controllers/base_report_controller.rb

@@ -1,9 +1,9 @@
 class BaseReportController < ActionController::Base
-	include LoginVerification
-	layout "application" 
+  include LoginVerification
+  layout "application" 
 
-	#before_action :check_installation
-	protect_from_forgery with: :exception
+  #before_action :check_installation
+  protect_from_forgery with: :exception
 
   	helper_method :shop_detail
 
@@ -12,10 +12,6 @@ class BaseReportController < ActionController::Base
     redirect_to root_path
   end
 
-  def current_user
-    @current_user ||= Employee.find_by_token_session(session[:session_token]) if session[:session_token]
-  end
-
 	PERIOD = {
 		"today" => 0,
 		"yesterday" => 1,
@@ -85,13 +81,10 @@ class BaseReportController < ActionController::Base
 		    end
 
 	    return from, to 
-
-
 	end
 
 	#Shop Name in Navbor
   	def shop_detail
     	@shop = Shop.first
   	end
-  
 end