Resolve spec/models/repository_spec.rb

spec/models/repository_spec.rb

@@ -424,7 +424,6 @@ describe Repository do
     shared_examples 'finding commits by message' do
       it 'returns commits with messages containing a given string' do
         commit_ids = repository.find_commits_by_message('submodule').map(&:id)
-<<<<<<< HEAD
 
         expect(commit_ids).to include(
           '5937ac0a7beb003549fc5fd26fc247adbce4a52e',
@@ -437,20 +436,6 @@ describe Repository do
       it 'is case insensitive' do
         commit_ids = repository.find_commits_by_message('SUBMODULE').map(&:id)
 
-=======
-
-        expect(commit_ids).to include(
-          '5937ac0a7beb003549fc5fd26fc247adbce4a52e',
-          '6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9',
-          'cfe32cf61b73a0d5e9f13e774abde7ff789b1660'
-        )
-        expect(commit_ids).not_to include('913c66a37b4a45b9769037c55c2d238bd0942d2e')
-      end
-
-      it 'is case insensitive' do
-        commit_ids = repository.find_commits_by_message('SUBMODULE').map(&:id)
-
->>>>>>> upstream/master
         expect(commit_ids).to include('5937ac0a7beb003549fc5fd26fc247adbce4a52e')
       end
     end
@@ -2209,19 +2194,11 @@ describe Repository do
       it 'it is an ancestor' do
         expect(repository.ancestor?(ancestor.id, commit.id)).to eq(true)
       end
-<<<<<<< HEAD
-
-      it 'it is not an ancestor' do
-        expect(repository.ancestor?(commit.id, ancestor.id)).to eq(false)
-      end
-
-=======
 
       it 'it is not an ancestor' do
         expect(repository.ancestor?(commit.id, ancestor.id)).to eq(false)
       end
 
->>>>>>> upstream/master
       it 'returns false on nil-values' do
         expect(repository.ancestor?(nil, commit.id)).to eq(false)
         expect(repository.ancestor?(ancestor.id, nil)).to eq(false)