Commit c95477a9 authored by Sean McGivern's avatar Sean McGivern

Fix conflicts in issue model

parent 0bf45519
...@@ -39,12 +39,9 @@ class Issue < ActiveRecord::Base ...@@ -39,12 +39,9 @@ class Issue < ActiveRecord::Base
has_many :issue_assignees has_many :issue_assignees
has_many :assignees, -> { auto_include(false) }, class_name: "User", through: :issue_assignees has_many :assignees, -> { auto_include(false) }, class_name: "User", through: :issue_assignees
<<<<<<< HEAD
has_one :epic_issue has_one :epic_issue
has_one :epic, through: :epic_issue has_one :epic, through: :epic_issue
=======
>>>>>>> upstream/master
validates :project, presence: true validates :project, presence: true
......
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