Commit 0fc51747 authored by Stan Hu's avatar Stan Hu

Resolve conflicts in app/policies/group_policy.rb

parent 59db98a0
......@@ -53,11 +53,8 @@ class GroupPolicy < BasePolicy
rule { admin }.enable :read_group
rule { has_projects }.policy do
<<<<<<< HEAD
enable :read_group
enable :read_list
=======
>>>>>>> dev/master
enable :read_label
end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment