Resolve conflicts in app/services/ci/process_build_service.rb

117ab089 · Stan Hu · e36e1c35 · 117ab089
Commit 117ab089 authored Oct 06, 2018 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/services/ci/process_build_service.rb app/services/ci/process_build_service.rb +0 -3

No files found.
--- a/app/services/ci/process_build_service.rb
+++ b/app/services/ci/process_build_service.rb
@@ -2,11 +2,8 @@

 module Ci
  class ProcessBuildService < BaseService
-<<<<<<< HEAD
    prepend EE::Ci::ProcessBuildService

-=======
->>>>>>> upstream/master
    def execute(build, current_status)
      if valid_statuses_for_when(build.when).include?(current_status)
        if build.schedulable?