Fix group sidebar conflicts

272b94f6 · Annabel Dunstone Gray · 5d81836a · 272b94f6
Commit 272b94f6 authored Aug 07, 2017 by Annabel Dunstone Gray
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/views/layouts/nav/_new_group_sidebar.html.haml app/views/layouts/nav/_new_group_sidebar.html.haml +0 -3

No files found.
--- a/app/views/layouts/nav/_new_group_sidebar.html.haml
+++ b/app/views/layouts/nav/_new_group_sidebar.html.haml
@@ -94,8 +94,5 @@
            = link_to group_settings_ci_cd_path(@group), title: 'CI / CD' do
              %span
                CI / CD
-<<<<<<< HEAD

          = render "groups/ee/settings_nav"
-=======
->>>>>>> ce-com/master