Fix conflict in spec/models/ci/runner_spec.rb

1 files changed, 1 insertions, 6 deletions

diff --git a/spec/models/ci/runner_spec.rb b/spec/models/ci/runner_spec.rb
index ef769a617ed..4c1d3c712f4 100644
--- a/spec/models/ci/runner_spec.rb
+++ b/spec/models/ci/runner_spec.rb
@@ -198,16 +198,11 @@ describe Ci::Runner do
   end
 
   describe '#assign_to' do
-<<<<<<< HEAD
-    let!(:project) { FactoryBot.create :project }
-    let!(:shared_runner) { FactoryBot.create(:ci_runner, :shared) }
-=======
     let!(:project) { FactoryBot.create(:project) }
->>>>>>> f91aaccf4d0... Merge branch 'correct-runner-type-when-assigning-shared-to-project' into 'master'
 
     subject { runner.assign_to(project) }
 
-    context 'with shared_runner' do
+    context 'with shared runner' do
       let!(:runner) { FactoryBot.create(:ci_runner, :shared) }
 
       it 'transitions shared runner to project runner and assigns project' do