remove conflict data

app/controllers/base_report_controller.rb

@@ -1,18 +1,15 @@
-class BaseReportController < ApplicationController
-	layout "application" 
+class BaseReportController < ActionController::Base
+  include LoginVerification
+  layout "application" 
 
-	#before_action :check_installation
-	protect_from_forgery with: :exception
+  #before_action :check_installation
+  protect_from_forgery with: :exception
 
-	rescue_from CanCan::AccessDenied do |exception|
+  rescue_from CanCan::AccessDenied do |exception|
     flash[:warning] = exception.message
     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,
@@ -82,8 +79,5 @@ class BaseReportController < ApplicationController
 		    end
 
 	    return from, to 
-
-
 	end
-  
 end