Fix conflicts in library code

config/routes/project.rb

@@ -169,7 +169,6 @@ constraints(ProjectUrlConstrainer.new) do
         end
       end
 
-<<<<<<< HEAD
       ## EE-specific
       resources :path_locks, only: [:index, :destroy] do
         collection do
@@ -181,8 +180,6 @@ constraints(ProjectUrlConstrainer.new) do
       get '/service_desk' => 'service_desk#show', as: :service_desk
       put '/service_desk' => 'service_desk#update', as: :service_desk_refresh
 
-=======
->>>>>>> ce/master
       resources :variables, only: [:index, :show, :update, :create, :destroy]
       resources :triggers, only: [:index, :create, :edit, :update, :destroy] do
         member do

lib/api/entities.rb

@@ -519,13 +519,10 @@ module API
       def expose_members_count_with_descendants?(namespace, opts)
         namespace.kind == 'group' && Ability.allowed?(opts[:current_user], :admin_group, namespace)
       end
-<<<<<<< HEAD
 
       # EE-only
       expose :shared_runners_minutes_limit, if: lambda { |_, options| options[:current_user]&.admin? }
       expose :plan, if: -> (namespace, opts) { Ability.allowed?(opts[:current_user], :admin_namespace, namespace) }
-=======
->>>>>>> ce/master
     end
 
     class MemberAccess < Grape::Entity

lib/api/namespaces.rb

@@ -18,7 +18,6 @@ module API
         namespaces = namespaces.search(params[:search]) if params[:search].present?
 
         present paginate(namespaces), with: Entities::Namespace, current_user: current_user
-<<<<<<< HEAD
       end
 
       desc 'Update a namespace' do
@@ -40,8 +39,6 @@ module API
         else
           render_validation_error!(namespace)
         end
-=======
->>>>>>> ce/master
       end
     end
   end

lib/api/projects.rb

-<<<<<<< HEAD
-require 'declarative_policy'
-=======
 require_dependency 'declarative_policy'
->>>>>>> ce/master
 
 module API
   # Projects API