Resolve conflicts in app/policies/personal_snippet_policy.rb

43d7fb13 · Stan Hu · 9a3b09ad · 43d7fb13
Commit 43d7fb13 authored Feb 05, 2019 by Stan Hu
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/policies/personal_snippet_policy.rb app/policies/personal_snippet_policy.rb +0 -3

No files found.
--- a/app/policies/personal_snippet_policy.rb
+++ b/app/policies/personal_snippet_policy.rb
@@ -32,9 +32,6 @@ class PersonalSnippetPolicy < BasePolicy
    enable :create_note
    enable :award_emoji
  end
-<<<<<<< HEAD

  rule { full_private_access }.enable :read_personal_snippet
-=======
->>>>>>> dev/master
 end