Resolve groups feature specs

spec/features/groups/activity_spec.rb

@@ -19,11 +19,7 @@ feature 'Group activity page' do
       it_behaves_like "an autodiscoverable RSS feed with current_user's RSS token"
     end
 
-<<<<<<< HEAD
-    context 'when project in the group', :js do
-=======
     context 'when project is in the group', :js do
->>>>>>> upstream/master
       let(:project) { create(:project, :public, namespace: group) }
 
       before do

spec/features/groups/issues_spec.rb

@@ -68,11 +68,7 @@ feature 'Group issues page' do
       it 'does not render issue' do
         visit path
 
-<<<<<<< HEAD
-        expect(page).not_to have_content issue.title
-=======
         expect(page).not_to have_content issue.title[0..80]
->>>>>>> upstream/master
       end
     end
   end

spec/features/groups/show_spec.rb

@@ -30,18 +30,6 @@ feature 'Group show page' do
       end
 
       it_behaves_like "an autodiscoverable RSS feed without an RSS token"
-<<<<<<< HEAD
-    end
-
-    context 'when group has a public project', :js do
-      let!(:project) { create(:project, :public, namespace: group) }
-
-      it 'renders public project' do
-        visit path
-
-        expect(page).to have_link group.name
-        expect(page).to have_link project.name
-=======
     end
 
     context 'when group has a public project', :js do
@@ -63,7 +51,6 @@ feature 'Group show page' do
 
         expect(page).to have_link group.name
         expect(page).not_to have_link project.name
->>>>>>> upstream/master
       end
     end
   end