Update pipeline.rb

9778b0d1 · Francisco Javier López · cf49dc01 · 9778b0d1
Commit 9778b0d1 authored Dec 05, 2018 by Francisco Javier López
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/models/ci/pipeline.rb app/models/ci/pipeline.rb +0 -3

No files found.
--- a/app/models/ci/pipeline.rb
+++ b/app/models/ci/pipeline.rb
@@ -12,11 +12,8 @@ module Ci
    include AtomicInternalId
    include EnumWithNil

-<<<<<<< HEAD
    prepend ::EE::Ci::Pipeline

-=======
->>>>>>> upstream/master
    belongs_to :project, inverse_of: :all_pipelines
    belongs_to :user
    belongs_to :auto_canceled_by, class_name: 'Ci::Pipeline'