Resolve conflicts in app/models/commit_status.rb

fc8de613 · Stan Hu · e8f26adf · fc8de613
Commit fc8de613 authored Oct 06, 2018 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

app/models/commit_status.rb app/models/commit_status.rb +0 -4

No files found.
--- a/app/models/commit_status.rb
+++ b/app/models/commit_status.rb
@@ -53,11 +53,7 @@ class CommitStatus < ActiveRecord::Base
    missing_dependency_failure: 5,
    runner_unsupported: 6,
    stale_schedule: 7
-<<<<<<< HEAD
  }.merge(EE_FAILURE_REASONS)
-=======
-  }
->>>>>>> upstream/master
  ##
  # We still create some CommitStatuses outside of CreatePipelineService.