Resolves MergeRequest model conflict

39a4258a · Tiago Botelho · 3ff4bf36 · 39a4258a
Commit 39a4258a authored Oct 02, 2018 by Tiago Botelho
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

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

No files found.
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -7,10 +7,6 @@ class MergeRequest < ActiveRecord::Base
  include Noteable
  include Referable
  include Presentable
-<<<<<<< HEAD
-  include Elastic::MergeRequestsSearch
-=======
->>>>>>> upstream/master
  include IgnorableColumn
  include TimeTrackable
  include ManualInverseAssociation