Resolve OmniauthCallbacksController conflict

15bf2d3e · Robert Speicher · 66e4c2f6 · 15bf2d3e
Commit 15bf2d3e authored Feb 05, 2016 by Robert Speicher
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

app/controllers/omniauth_callbacks_controller.rb app/controllers/omniauth_callbacks_controller.rb +0 -4

No files found.
--- a/app/controllers/omniauth_callbacks_controller.rb
+++ b/app/controllers/omniauth_callbacks_controller.rb
@@ -30,11 +30,7 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
    # Do additional LDAP checks for the user filter and EE features
    if ldap_user.allowed?
-<<<<<<< HEAD
-      if @user.otp_required_for_login?
-=======
      if @user.two_factor_enabled?
->>>>>>> 9afcacb3a4f50d45d19b7222edbe0902daa35bb4
        prompt_for_two_factor(@user)
      else
        log_audit_event(@user, with: :ldap)