Resolve conflicts in app/models/merge_request.rb

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

Resolve conflicts in app/models/merge_request.rb
Signed-off-by: Rémy Coutable <remy@rymai.me>
d1cb1b2b · Rémy Coutable · 8ec77f6b · d1cb1b2b
Commit d1cb1b2b authored Aug 09, 2017 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/models/merge_request.rb app/models/merge_request.rb +0 -3

No files found.
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -10,11 +10,8 @@ class MergeRequest < ActiveRecord::Base

  ignore_column :position
  ignore_column :locked_at
-<<<<<<< HEAD

  include ::EE::MergeRequest
-=======
->>>>>>> upstream/master

  belongs_to :target_project, class_name: "Project"
  belongs_to :source_project, class_name: "Project"