Resolve spec/helpers/auth_helper_spec.rb

spec/helpers/auth_helper_spec.rb

@@ -33,14 +33,11 @@ describe AuthHelper do
       allow(helper).to receive(:auth_providers) { [:twitter, :ldapmain] }
       expect(helper.providers_for_base_controller).not_to include(:ldapmain)
     end
-<<<<<<< HEAD
 
     it 'excludes group_saml' do
       allow(helper).to receive(:auth_providers) { [:group_saml] }
       expect(helper.providers_for_base_controller).to eq([])
     end
-=======
->>>>>>> upstream/master
   end
 
   describe "form_based_providers" do
@@ -53,14 +50,11 @@ describe AuthHelper do
       allow(helper).to receive(:auth_providers) { [:twitter, :crowd] }
       expect(helper.form_based_providers).to eq %i(crowd)
     end
-<<<<<<< HEAD
 
     it 'includes kerberos provider' do
       allow(helper).to receive(:auth_providers) { [:twitter, :kerberos] }
       expect(helper.form_based_providers).to eq %i(kerberos)
     end
-=======
->>>>>>> upstream/master
   end
 
   describe 'enabled_button_based_providers' do