Resolve config/routes/project.rb

Signed-off-by: Rémy Coutable <remy@rymai.me>

Resolve config/routes/project.rb
Signed-off-by: Rémy Coutable <remy@rymai.me>
967bcffc · Rémy Coutable · 4e6eb422 · 967bcffc
Commit 967bcffc authored Oct 04, 2018 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 5 deletions

config/routes/project.rb config/routes/project.rb +4 -5

No files found.
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -430,12 +430,11 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
        end
        collection do
          post :bulk_update
-<<<<<<< HEAD
-          post :export_csv
-          get :service_desk ## EE-specific
+          ## EE-specific START
-=======
+          post :export_csv
->>>>>>> upstream/master
+          get :service_desk
+          ## EE-specific END
        end
        resources :issue_links, only: [:index, :create, :destroy], as: 'links', path: 'links'