Resolving conflict with config/routes/project.rb

config/routes/project.rb

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