Resolve app/models/note.rb

a3a14486 · Robert Speicher · b5a1feed · a3a14486
Commit a3a14486 authored Sep 13, 2018 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

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

No files found.
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -185,13 +185,10 @@ class Note < ActiveRecord::Base
    end
  end
-<<<<<<< HEAD
  def searchable?
    !system
  end
-=======
->>>>>>> upstream/master
  # rubocop: disable CodeReuse/ServiceClass
  def cross_reference?
    return unless system?