Skip to content
Snippets Groups Projects
Commit 43d7fb13 authored by Stan Hu's avatar Stan Hu
Browse files

Resolve conflicts in app/policies/personal_snippet_policy.rb

parent 9a3b09ad
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment