Fix merge conflict in Ci::CreatePipelineService

bd71a053 · Nick Thomas · bde12f75 · bd71a053
Commit bd71a053 authored Jun 08, 2017 by Nick Thomas
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

app/services/ci/create_pipeline_service.rb app/services/ci/create_pipeline_service.rb +0 -4

No files found.
--- a/app/services/ci/create_pipeline_service.rb
+++ b/app/services/ci/create_pipeline_service.rb
@@ -60,13 +60,9 @@ module Ci
      Ci::Pipeline.transaction do
        update_merge_requests_head_pipeline if pipeline.save
-<<<<<<< HEAD
-        Ci::CreatePipelineStagesService
-=======
        yield(pipeline) if block_given?
        Ci::CreatePipelineBuildsService
->>>>>>> master
          .new(project, current_user)
          .execute(pipeline)
      end