Resolve conflicts in spec/policies/group_policy_spec.rb

1 files changed, 0 insertions, 12 deletions

diff --git a/spec/policies/group_policy_spec.rb b/spec/policies/group_policy_spec.rb
index 5cb0183df3a..4c31ff30fc6 100644
--- a/spec/policies/group_policy_spec.rb
+++ b/spec/policies/group_policy_spec.rb
@@ -114,25 +114,13 @@ describe GroupPolicy do
       project.add_developer(current_user)
     end
 
-<<<<<<< HEAD
-    it do
-      expect_allowed(:read_group, :read_list, :read_label)
-    end
-=======
     it { expect_allowed(:read_label) }
->>>>>>> dev/master
 
     context 'in subgroups', :nested_groups do
       let(:subgroup) { create(:group, :private, parent: group) }
       let(:project) { create(:project, namespace: subgroup) }
 
-<<<<<<< HEAD
-      it do
-        expect_allowed(:read_group, :read_list, :read_label)
-      end
-=======
       it { expect_allowed(:read_label) }
->>>>>>> dev/master
     end
   end