Resolve app/models/epic.rb

9fdb7498 · Robert Speicher · 8b7f87de · 9fdb7498
Commit 9fdb7498 authored Sep 18, 2018 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

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

No files found.
--- a/app/models/epic.rb
+++ b/app/models/epic.rb
@@ -3,11 +3,8 @@
 # Placeholder class for model that is implemented in EE
 # It reserves '&' as a reference prefix, but the table does not exists in CE
 class Epic < ActiveRecord::Base
-<<<<<<< HEAD
  prepend EE::Epic

-=======
->>>>>>> upstream/master
  def self.link_reference_pattern
    nil
  end