Fix upstream merge conflict in Issue model.

d97d6091 · Andreas Brandl · 0936f120 · d97d6091
Commit d97d6091 authored Mar 19, 2018 by Andreas Brandl
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

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

No files found.
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
 require 'carrierwave/orm/activerecord'
 class Issue < ActiveRecord::Base
-<<<<<<< HEAD
  prepend EE::Issue
  prepend EE::RelativePositioning
-=======
->>>>>>> upstream/master
  include AtomicInternalId
  include Issuable
  include Noteable