Resolve conflict in app/controllers/omniauth_callbacks_controller.rb

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

app/controllers/omniauth_callbacks_controller.rb

@@ -36,11 +36,8 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
         prompt_for_two_factor(@user)
       else
         log_audit_event(@user, with: oauth['provider'])
-<<<<<<< HEAD
         # The counter only gets incremented in `sign_in_and_redirect`
         show_ldap_sync_flash if @user.sign_in_count == 0
-=======
->>>>>>> upstream/master
         sign_in_and_redirect(@user)
       end
     else
@@ -159,13 +156,13 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
   def oauth
     @oauth ||= request.env['omniauth.auth']
   end
-  
+
   def fail_login
     error_message = @user.errors.full_messages.to_sentence
 
     return redirect_to omniauth_error_path(oauth['provider'], error: error_message)
   end
-  
+
   def fail_ldap_login
     flash[:alert] = 'Access denied for your LDAP account.'