Resolve app/helpers/auth_helper.rb

f61463dc · Robert Speicher · ffacc675 · f61463dc
Commit f61463dc authored May 01, 2018 by Robert Speicher
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/helpers/auth_helper.rb app/helpers/auth_helper.rb +0 -3

No files found.
--- a/app/helpers/auth_helper.rb
+++ b/app/helpers/auth_helper.rb
@@ -3,11 +3,8 @@ module AuthHelper

  PROVIDERS_WITH_ICONS = %w(twitter github gitlab bitbucket google_oauth2 facebook azure_oauth2 authentiq).freeze
  LDAP_PROVIDER = /\Aldap/
-<<<<<<< HEAD

  delegate :slack_app_id, to: :'Gitlab::CurrentSettings.current_application_settings'
-=======
->>>>>>> upstream/master

  def ldap_enabled?
    Gitlab::Auth::LDAP::Config.enabled?