fix conflicts in app/views/groups/_settings_head.html.haml

30df944f · Mike Greiling · 3ae9d7da · 30df944f
Commit 30df944f authored Jul 08, 2017 by Mike Greiling
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

app/views/groups/_settings_head.html.haml app/views/groups/_settings_head.html.haml +2 -4

No files found.
--- a/app/views/groups/_settings_head.html.haml
+++ b/app/views/groups/_settings_head.html.haml
@@ -13,11 +13,9 @@
            %span
              Projects

-<<<<<<< HEAD
-        = render 'groups/ee/settings_nav'
-=======
        = nav_link(controller: :ci_cd) do
          = link_to group_settings_ci_cd_path(@group), title: 'Pipelines' do
            %span
              Pipelines
->>>>>>> master-ce
+
+        = render 'groups/ee/settings_nav'