CE->EE: Resolve conflicts in spec/models/project_spec.rb

ee/spec/models/project_spec.rb

@@ -22,6 +22,7 @@ describe Project do
     it { is_expected.to have_many(:source_pipelines) }
     it { is_expected.to have_many(:audit_events).dependent(false) }
     it { is_expected.to have_many(:protected_environments) }
+    it { is_expected.to have_many(:approver_groups).dependent(:destroy) }
   end
 
   describe 'validations' do

spec/models/project_spec.rb

@@ -77,10 +77,6 @@ describe Project do
     it { is_expected.to have_many(:lfs_objects_projects) }
     it { is_expected.to have_many(:project_group_links) }
     it { is_expected.to have_many(:notification_settings).dependent(:delete_all) }
-<<<<<<< HEAD
-    it { is_expected.to have_many(:approver_groups).dependent(:destroy) }
-=======
->>>>>>> upstream/master
     it { is_expected.to have_many(:forked_to_members).class_name('ForkNetworkMember') }
     it { is_expected.to have_many(:forks).through(:forked_to_members) }
     it { is_expected.to have_many(:uploads) }