Resolve conflict in app/models/ci/pipeline.rb

Signed-off-by: Rémy Coutable <remy@rymai.me>

Resolve conflict in app/models/ci/pipeline.rb
Signed-off-by: Rémy Coutable <remy@rymai.me>
926d8457 · Rémy Coutable · 4d45d6c9 · 926d8457
Commit 926d8457 authored Jan 16, 2018 by Rémy Coutable
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
@@ -7,11 +7,8 @@ module Ci
    include Presentable
    include Gitlab::OptimisticLocking

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

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