Resolve conflicts in spec/models/user_spec.rb

spec/models/user_spec.rb

@@ -382,7 +382,6 @@ describe User do
           expect(user).to be_valid
         end
       end
-<<<<<<< HEAD
     end
 
     it 'does not allow a user to be both an auditor and an admin' do
@@ -402,8 +401,6 @@ describe User do
       users = described_class.non_ldap
       expect(users.count).to eq 2
       expect(users.detect { |user| user.username == ldap_user.username }).to be_nil
-=======
->>>>>>> upstream/master
     end
   end