Resolve conflict in app/controllers/application_controller.rb

Signed-off-by: Rémy Coutable <remy@rymai.me>

app/controllers/application_controller.rb

@@ -204,12 +204,7 @@ class ApplicationController < ActionController::Base
   end
 
   def check_password_expiration
-<<<<<<< HEAD
     return if session[:impersonator_id] || !current_user&.allow_password_authentication?
-=======
-    return if session[:impersonator_id]
-    return unless current_user&.allow_password_authentication?
->>>>>>> origin/master
 
     password_expires_at = current_user&.password_expires_at