Fixing ldap conflicts

spec/lib/gitlab/auth/ldap/user_spec.rb

 require 'spec_helper'
 
 describe Gitlab::Auth::LDAP::User do
-<<<<<<< HEAD:spec/lib/gitlab/auth/ldap/user_spec.rb
   include LdapHelpers
 
-=======
->>>>>>> upstream/master:spec/lib/gitlab/auth/ldap/user_spec.rb
   let(:ldap_user) { described_class.new(auth_hash) }
   let(:gl_user) { ldap_user.gl_user }
   let(:info) do
@@ -183,12 +180,7 @@ describe Gitlab::Auth::LDAP::User do
 
   describe 'blocking' do
     def configure_block(value)
-<<<<<<< HEAD:spec/lib/gitlab/auth/ldap/user_spec.rb
       stub_ldap_config(block_auto_created_users: value)
-=======
-      allow_any_instance_of(Gitlab::Auth::LDAP::Config)
-          .to receive(:block_auto_created_users).and_return(value)
->>>>>>> upstream/master:spec/lib/gitlab/auth/ldap/user_spec.rb
     end
 
     context 'signup' do

spec/support/ldap_helpers.rb

@@ -3,15 +3,12 @@ module LdapHelpers
 
   def ldap_adapter(provider = 'ldapmain', ldap = double(:ldap))
     ::Gitlab::Auth::LDAP::Adapter.new(provider, ldap)
-<<<<<<< HEAD
   end
 
   def fake_ldap_sync_proxy(provider)
     fake_proxy = double(:proxy, adapter: ldap_adapter)
     allow(::EE::Gitlab::Auth::LDAP::Sync::Proxy).to receive(:open).with(provider).and_yield(fake_proxy)
     fake_proxy
-=======
->>>>>>> upstream/master
   end
 
   def user_dn(uid)