Style rules; Revert some examples

1 files changed, 0 insertions, 8 deletions

diff --git a/spec/policies/group_policy_spec.rb b/spec/policies/group_policy_spec.rb
index 893b686da43..dc3675a7b9e 100644
--- a/spec/policies/group_policy_spec.rb
+++ b/spec/policies/group_policy_spec.rb
@@ -506,15 +506,11 @@ describe GroupPolicy do
 
   context "create_subgroup" do
     context 'when group has subgroup creation level set to owner' do
-<<<<<<< HEAD
       let(:group) do
         create(
           :group,
           subgroup_creation_level: ::Gitlab::Access::OWNER_SUBGROUP_ACCESS)
       end
-=======
-      let(:group) { create(:group, subgroup_creation_level: ::Gitlab::Access::OWNER_SUBGROUP_ACCESS) }
->>>>>>> Add examples specing the setting to choose who can create subgroups
 
       context 'reporter' do
         let(:current_user) { reporter }
@@ -542,15 +538,11 @@ describe GroupPolicy do
     end
 
     context 'when group has subgroup creation level set to maintainer' do
-<<<<<<< HEAD
       let(:group) do
         create(
           :group,
           subgroup_creation_level: ::Gitlab::Access::MAINTAINER_SUBGROUP_ACCESS)
       end
-=======
-      let(:group) { create(:group, subgroup_creation_level: ::Gitlab::Access::MAINTAINER_SUBGROUP_ACCESS) }
->>>>>>> Add examples specing the setting to choose who can create subgroups
 
       context 'reporter' do
         let(:current_user) { reporter }