diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-03-04 22:27:21 -0800 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-03-04 22:27:21 -0800 |
| commit | 0fc51747b78c7cb3b590f29354fc236bfcb847f4 (patch) | |
| tree | 8b7c7ee4cf87d7db71d8413542355a8c3ba1dde6 /app/policies | |
| parent | 59db98a0cabea4421434655d7f7873110363d21a (diff) | |
| download | gitlab-ce-0fc51747b78c7cb3b590f29354fc236bfcb847f4.tar.gz | |
Resolve conflicts in app/policies/group_policy.rb
Diffstat (limited to 'app/policies')
| -rw-r--r-- | app/policies/group_policy.rb | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/app/policies/group_policy.rb b/app/policies/group_policy.rb index 2b0f1d25534..298769c0eb8 100644 --- a/app/policies/group_policy.rb +++ b/app/policies/group_policy.rb @@ -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 |