Resolve notes conflicts

c168c321 · Sean McGivern · 6b12f8fc · c168c321
Commit c168c321 authored Sep 08, 2017 by Sean McGivern
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
@@ -160,13 +160,10 @@ class Note < ActiveRecord::Base
    def has_special_role?(role, note)
      note.special_role == role
    end
-<<<<<<< HEAD
  end

  def searchable?
    !system
-=======
->>>>>>> upstream/master
  end

  def cross_reference?