Resolve conflcits - EE-only block

30d352a0 · Simon Knox · cf84e518 · 30d352a0
Commit 30d352a0 authored Mar 14, 2018 by Simon Knox
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

config/routes/project.rb config/routes/project.rb +0 -3

No files found.
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -140,14 +140,11 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
          post :bulk_update
        end
-<<<<<<< HEAD
        ## EE-specific
        resources :approvers, only: :destroy
        resources :approver_groups, only: :destroy
        ## EE-specific
-=======
->>>>>>> upstream/master
        resources :discussions, only: [:show], constraints: { id: /\h{40}/ } do
          member do
            post :resolve