Resolve conflicts in config/routes/project.rb

config/routes/project.rb

@@ -485,18 +485,14 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
           post :reset_cache
         end
         resource :integrations, only: [:show]
-<<<<<<< HEAD
 
         resource :slack, only: [:destroy, :edit, :update] do
           get :slack_auth
         end
 
-        resource :repository, only: [:show], controller: :repository
-=======
         resource :repository, only: [:show], controller: :repository do
           post :create_deploy_token, path: 'deploy_token/create'
         end
->>>>>>> upstream/master
       end
 
       # Since both wiki and repository routing contains wildcard characters