Resolve conflicts in views

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

app/views/layouts/devise.html.haml

@@ -2,10 +2,7 @@
 %html.devise-layout-html{ class: system_message_class }
   = render "layouts/head"
   %body.ui-indigo.login-page.application.navless{ data: { page: body_data_page } }
-<<<<<<< HEAD
     = header_message
-=======
->>>>>>> upstream/master
     .page-wrap
       = render "layouts/header/empty"
       .login-page-broadcast

app/views/layouts/devise_empty.html.haml

@@ -2,10 +2,7 @@
 %html{ lang: "en", class: system_message_class }
   = render "layouts/head"
   %body.ui-indigo.login-page.application.navless
-<<<<<<< HEAD
     = header_message
-=======
->>>>>>> upstream/master
     = render "layouts/header/empty"
     = render "layouts/broadcast"
     .container.navless-container

app/views/projects/project_members/index.html.haml

@@ -16,7 +16,6 @@
           %i Owners
 
     .light
-<<<<<<< HEAD
       - if can_admin_project_members && project_can_be_shared?
         - if !membership_locked? && @project.allowed_to_share_with_group?
           %ul.nav-links.nav.nav-tabs.gitlab-tabs{ role: 'tablist' }
@@ -35,17 +34,6 @@
         - elsif @project.allowed_to_share_with_group?
           .share-with-group= render 'projects/project_members/new_shared_group', tab_title: 'Share with group'
 
-=======
-      - if can?(current_user, :admin_project_member, @project)
-        %ul.nav-links.nav.nav-tabs.gitlab-tabs{ role: 'tablist' }
-          %li.nav-tab{ role: 'presentation' }
-            %a.nav-link.active{ href: '#add-member-pane', id: 'add-member-tab', data: { toggle: 'tab' }, role: 'tab' } Add member
-          - if @project.allowed_to_share_with_group?
-            %li.nav-tab{ role: 'presentation' }
-              %a.nav-link{ href: '#share-with-group-pane', id: 'share-with-group-tab', data: { toggle: 'tab' }, role: 'tab' } Share with group
->>>>>>> upstream/master
-
-
         = render 'shared/members/requests', membership_source: @project, requesters: @requesters
         .clearfix
           %h5.member.existing-title