Resolve conflict in config/routes/group.rb

717ebf51 · Marin Jankovski · 7101f455 · 717ebf51
Commit 717ebf51 authored Feb 06, 2018 by Marin Jankovski
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

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

No files found.
--- a/config/routes/group.rb
+++ b/config/routes/group.rb
@@ -14,10 +14,7 @@ constraints(GroupUrlConstrainer.new) do
      get :merge_requests, as: :merge_requests_group
      get :projects, as: :projects_group
      get :activity, as: :activity_group
-<<<<<<< HEAD
      get :subgroups, as: :subgroups_group ## EE-specific
-=======
->>>>>>> upstream/master
      put :transfer, as: :transfer_group
    end