Resolve conflicts related to RedirectRoute

spec/controllers/groups_controller_spec.rb

@@ -213,7 +213,6 @@ describe GroupsController do
         expect(response).to have_http_status(404)
       end
     end
-<<<<<<< HEAD
   end
 
   describe 'POST create' do
@@ -258,7 +257,5 @@ describe GroupsController do
         expect(response).to have_http_status(302)
       end
     end
-=======
->>>>>>> upstream/master
   end
 end

spec/controllers/projects_controller_spec.rb

@@ -497,7 +497,6 @@ describe ProjectsController do
         expect(controller).to set_flash[:notice].to(/moved/)
       end
     end
-<<<<<<< HEAD
   end
 
   describe 'GET edit' do
@@ -520,8 +519,6 @@ describe ProjectsController do
 
       expect(response).to have_http_status(200)
     end
-=======
->>>>>>> upstream/master
   end
 
   describe 'POST #preview_markdown' do