diff options
| -rw-r--r-- | app/policies/personal_snippet_policy.rb | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/app/policies/personal_snippet_policy.rb b/app/policies/personal_snippet_policy.rb index 8ff17ba291a..2b5cca76c20 100644 --- 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 |