Fix conflicts in issue model

c95477a9 · Sean McGivern · 0bf45519 · c95477a9
Commit c95477a9 authored Apr 10, 2018 by Sean McGivern
Show 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
@@ -39,12 +39,9 @@ class Issue < ActiveRecord::Base

  has_many :issue_assignees
  has_many :assignees, -> { auto_include(false) }, class_name: "User", through: :issue_assignees
-<<<<<<< HEAD

  has_one :epic_issue
  has_one :epic, through: :epic_issue
-=======
->>>>>>> upstream/master

  validates :project, presence: true