Resolve conflict in app/views/layouts/nav/_new_group_sidebar.html.haml

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

app/views/layouts/nav/_new_group_sidebar.html.haml

@@ -55,11 +55,7 @@
         %span
           Members
     - if current_user && can?(current_user, :admin_group, @group)
-<<<<<<< HEAD
       = nav_link(path: %w[groups#projects groups#edit ci_cd#show ldap_group_links#index hooks#index audit_events#index pipeline_quota#index]) do
-=======
-      = nav_link(path: %w[groups#projects groups#edit ci_cd#show]) do
->>>>>>> upstream/master
         = link_to edit_group_path(@group), title: 'Settings' do
           %span
             Settings
@@ -78,8 +74,5 @@
             = link_to group_settings_ci_cd_path(@group), title: 'Pipelines' do
               %span
                 Pipelines
-<<<<<<< HEAD
 
           = render "groups/ee/settings_nav"
-=======
->>>>>>> upstream/master