Resolve CE/EE merging conflicts

Resolved for:
- lib/api/namespaces.rb
- spec/policies/namespace_policy_spec.rb
- spec/requests/api/namespaces_spec.rb

lib/api/namespaces.rb

@@ -20,7 +20,6 @@ module API
         present paginate(namespaces), with: Entities::Namespace, current_user: current_user
       end
 
-<<<<<<< HEAD
       desc 'Update a namespace' do
         success Entities::Namespace
       end
@@ -42,8 +41,6 @@ module API
         end
       end
 
-=======
->>>>>>> c26d7089d058dc22116f383815da8cec80a99ac5
       desc 'Get a namespace by ID' do
         success Entities::Namespace
       end

spec/policies/namespace_policy_spec.rb

@@ -3,10 +3,7 @@ require 'spec_helper'
 describe NamespacePolicy do
   let(:user) { create(:user) }
   let(:owner) { create(:user) }
-<<<<<<< HEAD
   let(:auditor) { create(:user, :auditor) }
-=======
->>>>>>> c26d7089d058dc22116f383815da8cec80a99ac5
   let(:admin) { create(:admin) }
   let(:namespace) { create(:namespace, owner: owner) }
 
@@ -30,7 +27,6 @@ describe NamespacePolicy do
     let(:current_user) { owner }
 
     it { is_expected.to be_allowed(*owner_permissions) }
-<<<<<<< HEAD
 
     context 'user who has exceeded project limit' do
       let(:owner) { create(:user, projects_limit: 0) }
@@ -47,11 +43,6 @@ describe NamespacePolicy do
 
       it { is_expected.to be_allowed(*owner_permissions) }
     end
-=======
-
-    context 'user who has exceeded project limit' do
-      let(:owner) { create(:user, projects_limit: 0) }
->>>>>>> c26d7089d058dc22116f383815da8cec80a99ac5
 
     context 'non-owner' do
       it { is_expected.to be_disallowed(*owner_permissions) }

spec/requests/api/namespaces_spec.rb

@@ -94,7 +94,6 @@ describe API::Namespaces do
     end
   end
 
-<<<<<<< HEAD
   describe 'PUT /namespaces/:id' do
     context 'when authenticated as admin' do
       it 'updates namespace using full_path' do
@@ -141,8 +140,6 @@ describe API::Namespaces do
     end
   end
 
-=======
->>>>>>> c26d7089d058dc22116f383815da8cec80a99ac5
   describe 'GET /namespaces/:id' do
     let(:owned_group) { group1 }
     let(:user2) { create(:user) }