[CE->EE] Resolve spec conflicts

spec/models/merge_request_spec.rb

@@ -160,21 +160,13 @@ describe MergeRequest, models: true do
         subject.project.has_external_issue_tracker = true
         subject.project.save!
       end
-<<<<<<< HEAD
 
       it 'does not cache issues from external trackers' do
         issue  = ExternalIssue.new('JIRA-123', subject.project)
         commit = double('commit1', safe_message: "Fixes #{issue.to_reference}")
-        allow(subject).to receive(:commits).and_return([commit])
-
-=======
 
-      it 'does not cache issues from external trackers' do
-        issue  = ExternalIssue.new('JIRA-123', subject.project)
-        commit = double('commit1', safe_message: "Fixes #{issue.to_reference}")
         allow(subject).to receive(:commits).and_return([commit])
 
->>>>>>> d964816b9fe56679ffc0b331e701f7b24db5c6a9
         expect { subject.cache_merge_request_closes_issues!(subject.author) }.not_to change(subject.merge_requests_closing_issues, :count)
       end
 

spec/models/project_spec.rb

@@ -582,7 +582,6 @@ describe Project, models: true do
       let!(:internal_issue) { create(:issue, project: project) }
       before do
         allow(project).to receive(:external_issue_tracker).and_return(true)
-<<<<<<< HEAD
       end
 
       context 'when internal issues are enabled' do
@@ -603,28 +602,6 @@ describe Project, models: true do
         end
       end
 
-=======
-      end
-
-      context 'when internal issues are enabled' do
-        it 'returns interlan issue' do
-          issue = project.get_issue(internal_issue.iid, user)
-
-          expect(issue).to be_kind_of(Issue)
-          expect(issue.iid).to eq(internal_issue.iid)
-          expect(issue.project).to eq(project)
-        end
-
-        it 'returns an ExternalIssue when internal issue does not exists' do
-          issue = project.get_issue('FOO-1234', user)
-
-          expect(issue).to be_kind_of(ExternalIssue)
-          expect(issue.iid).to eq('FOO-1234')
-          expect(issue.project).to eq(project)
-        end
-      end
-
->>>>>>> d964816b9fe56679ffc0b331e701f7b24db5c6a9
       context 'when internal issues are disabled' do
         before do
           project.issues_enabled = false

spec/policies/project_policy_spec.rb

@@ -139,8 +139,6 @@ describe ProjectPolicy, models: true do
     end
   end
 
-<<<<<<< HEAD
-=======
   context 'when a project has pending invites, and the current user is anonymous' do
     let(:group) { create(:group, :public) }
     let(:project) { create(:empty_project, :public, namespace: group) }
@@ -159,7 +157,6 @@ describe ProjectPolicy, models: true do
     end
   end
 
->>>>>>> d964816b9fe56679ffc0b331e701f7b24db5c6a9
   context 'abilities for non-public projects' do
     let(:project) { create(:empty_project, namespace: owner.namespace) }