Resolve conflicts in app/policies/group_policy.rb

0fc51747 · Stan Hu · 59db98a0 · 0fc51747
Commit 0fc51747 authored Mar 04, 2019 by Stan Hu
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/policies/group_policy.rb app/policies/group_policy.rb +0 -3

No files found.
--- 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