Resolve conflict in config/routes/group.rb

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

config/routes/group.rb

@@ -12,8 +12,8 @@ constraints(GroupUrlConstrainer.new) do
   end
 end
 
-<<<<<<< HEAD
-resources :groups, constraints: { id: /[a-zA-Z.0-9_\-]+(?<!\.atom)/ }  do
+scope constraints: { id: /[a-zA-Z.0-9_\-]+(?<!\.atom)/ } do
+  resources :groups, except: [:show] do
     member do
       get :issues
       get :merge_requests
@@ -55,28 +55,7 @@ resources :groups, constraints: { id: /[a-zA-Z.0-9_\-]+(?<!\.atom)/ }  do
       end
     end
     ## EE-specific
-=======
-scope constraints: { id: /[a-zA-Z.0-9_\-]+(?<!\.atom)/ } do
-  resources :groups, except: [:show] do
-    member do
-      get :issues
-      get :merge_requests
-      get :projects
-      get :activity
   end
 
-    scope module: :groups do
-      resources :group_members, only: [:index, :create, :update, :destroy], concerns: :access_requestable do
-        post :resend_invite, on: :member
-        delete :leave, on: :collection
-      end
-
-      resource :avatar, only: [:destroy]
-      resources :milestones, constraints: { id: /[^\/]+/ }, only: [:index, :show, :update, :new, :create]
-
-      resources :labels, except: [:show], constraints: { id: /\d+/ }
-    end
-  end
   get 'groups/:id' => 'groups#show', as: :group_canonical
->>>>>>> 144358e98ee1b25b61854a3471e21e100ace9db5
 end