Resolve project_members conflicts

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

@@ -17,32 +17,18 @@
         %i Owners
     .light
       - if can?(current_user, :admin_project_member, @project)
-<<<<<<< HEAD
-        %ul.nav-links.project-member-tabs{ role: 'tablist' }
-          - if !membership_locked?
-            %li.active{ role: 'presentation' }
-              %a{ href: '#add-member-pane', id: 'add-member-tab', data: { toggle: 'tab' }, role: 'tab' } Add member
-=======
         %ul.nav-links.gitlab-tabs{ role: 'tablist' }
           %li.active{ role: 'presentation' }
             %a{ href: '#add-member-pane', id: 'add-member-tab', data: { toggle: 'tab' }, role: 'tab' } Add member
->>>>>>> upstream/master
           - if @project.allowed_to_share_with_group?
             %li{ role: 'presentation', class: ('active' if membership_locked?) }
               %a{ href: '#share-with-group-pane', id: 'share-with-group-tab', data: { toggle: 'tab' }, role: 'tab' } Share with group
 
-<<<<<<< HEAD
-        .tab-content.project-member-tab-content
+        .tab-content.gitlab-tab-content
           - if !membership_locked?
             .tab-pane.active{ id: 'add-member-pane', role: 'tabpanel' }
               = render 'projects/project_members/new_project_member', tab_title: 'Add member'
           .tab-pane{ id: 'share-with-group-pane', role: 'tabpanel', class: ('active' if membership_locked?) }
-=======
-        .tab-content.gitlab-tab-content
-          .tab-pane.active{ id: 'add-member-pane', role: 'tabpanel' }
-            = render 'projects/project_members/new_project_member', tab_title: 'Add member'
-          .tab-pane{ id: 'share-with-group-pane', role: 'tabpanel' }
->>>>>>> upstream/master
             = render 'projects/project_members/new_shared_group', tab_title: 'Share with group'
 
         = render 'shared/members/requests', membership_source: @project, requesters: @requesters