Update create_pipeline_service.rb

bb5194f5 · Francisco Javier López · 9778b0d1 · bb5194f5
Commit bb5194f5 authored Dec 05, 2018 by Francisco Javier López
Show 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
@@ -17,11 +17,7 @@ module Ci
                Gitlab::Ci::Pipeline::Chain::Create,
                EE::Gitlab::Ci::Pipeline::Chain::Limit::Activity].freeze
-<<<<<<< HEAD
    def execute(source, ignore_skip_ci: false, save_on_errors: true, trigger_request: nil, schedule: nil, merge_request: nil, mirror_update: false, &block)
-=======
-    def execute(source, ignore_skip_ci: false, save_on_errors: true, trigger_request: nil, schedule: nil, merge_request: nil, &block)
->>>>>>> upstream/master
      @pipeline = Ci::Pipeline.new
      command = Gitlab::Ci::Pipeline::Chain::Command.new(