Skip to content

G
gitlab-ce
Commit d1cb1b2b authored by Rémy Coutable's avatar Rémy Coutable
Browse files
Options

Resolve conflicts in app/models/merge_request.rb 

Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent 8ec77f6b
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
app/models/merge_request.rb
View file @ d1cb1b2b
...@@ -10,11 +10,8 @@ class MergeRequest < ActiveRecord::Base ...@@ -10,11 +10,8 @@ class MergeRequest < ActiveRecord::Base
ignore_column :position ignore_column :position
ignore_column :locked_at ignore_column :locked_at
<<<<<<< HEAD
include ::EE::MergeRequest include ::EE::MergeRequest
=======
>>>>>>> upstream/master
belongs_to :target_project, class_name: "Project" belongs_to :target_project, class_name: "Project"
belongs_to :source_project, class_name: "Project" belongs_to :source_project, class_name: "Project"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7