From c8fbfb3a644691f4f3f752ef79848faf8afad46d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Wed, 6 Jun 2018 12:13:35 +0200
Subject: [PATCH] Resolve conflict in app/models/ci/pipeline.rb
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: R茅my Coutable <remy@rymai.me>
---
 app/models/ci/pipeline.rb | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb
index d789626fbf8..c0b1d71ea37 100644
--- a/app/models/ci/pipeline.rb
+++ b/app/models/ci/pipeline.rb
@@ -20,7 +20,6 @@ module Ci
       s&.project&.pipelines&.maximum(:iid) || s&.project&.pipelines&.count
     end
 
-<<<<<<< HEAD
     has_one :source_pipeline, class_name: Ci::Sources::Pipeline
     has_many :sourced_pipelines, class_name: Ci::Sources::Pipeline, foreign_key: :source_pipeline_id
 
@@ -34,10 +33,7 @@ module Ci
       s&.project&.pipelines&.maximum(:iid) || s&.project&.pipelines&.count
     end
 
-    has_many :stages
-=======
     has_many :stages, -> { order(position: :asc) }, inverse_of: :pipeline
->>>>>>> upstream/master
     has_many :statuses, class_name: 'CommitStatus', foreign_key: :commit_id, inverse_of: :pipeline
     has_many :builds, foreign_key: :commit_id, inverse_of: :pipeline
     has_many :trigger_requests, dependent: :destroy, foreign_key: :commit_id # rubocop:disable Cop/ActiveRecordDependent
-- 
2.30.9