Resolve conflict in spec/finders/group_projects_finder_spec.rb

Signed-off-by: Rémy Coutable <remy@rymai.me>

spec/finders/group_projects_finder_spec.rb

@@ -126,7 +126,6 @@ describe GroupProjectsFinder do
         context 'without subgroups projects' do
           it { is_expected.to eq([public_project]) }
         end
-<<<<<<< HEAD
       end
     end
 
@@ -141,8 +140,6 @@ describe GroupProjectsFinder do
 
       context 'without subgroups projects' do
         it { is_expected.to match_array([shared_project_3, shared_project_2, shared_project_1, public_project]) }
-=======
->>>>>>> upstream/master
       end
     end
   end
@@ -161,7 +158,6 @@ describe GroupProjectsFinder do
     end
 
     context "all" do
-<<<<<<< HEAD
       it { is_expected.to eq([shared_project_3, shared_project_2, shared_project_1, private_project, public_project]) }
     end
   end
@@ -182,19 +178,6 @@ describe GroupProjectsFinder do
     context "all" do
       subject { described_class.new(group: group, current_user: current_user).execute }
       it      { is_expected.to eq([shared_project_3, shared_project_2, shared_project_1, private_project, public_project]) }
-=======
-      context 'with subgroups projects', :nested_groups do
-        before do
-          options[:include_subgroups] = true
-        end
-
-        it { is_expected.to match_array([shared_project_3, shared_project_2, shared_project_1, public_project, subgroup_project]) }
-      end
-
-      context 'without subgroups projects' do
-        it { is_expected.to match_array([shared_project_3, shared_project_2, shared_project_1, public_project]) }
-      end
->>>>>>> upstream/master
     end
   end