summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2019-02-05 14:38:28 -0800
committerStan Hu <stanhu@gmail.com>2019-02-05 14:38:28 -0800
commit43d7fb13890be0c840b8901191617fdc90edcf9e (patch)
tree753935f0d909dcc030436d1d9bce0150def3855c
parent9a3b09ad4b7fda11afeacdfb947c91c18347e503 (diff)
downloadgitlab-ce-43d7fb13890be0c840b8901191617fdc90edcf9e.tar.gz
Resolve conflicts in app/policies/personal_snippet_policy.rb
-rw-r--r--app/policies/personal_snippet_policy.rb3
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