Resolve conflict in app/views/projects/project_members/_index.html.haml

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

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

@@ -14,13 +14,8 @@
         or
         %i Owners
   .col-lg-9
-<<<<<<< HEAD
-    .light.prepend-top-default
-      - if can?(current_user, :admin_project_member, @project) && !membership_locked?
-        = render "projects/project_members/new_project_member"
-=======
     .light
-      - if can?(current_user, :admin_project_member, @project)
+      - if can?(current_user, :admin_project_member, @project) && !membership_locked?
         %ul.nav-links.project-member-tabs{ role: 'tablist' }
           %li.active{ role: 'presentation' }
             %a{ href: '#add-member-pane', id: 'add-member-tab', data: { toggle: 'tab' }, role: 'tab' } Add member
@@ -33,7 +28,6 @@
             = render 'projects/project_members/new_project_member', tab_title: 'Add member'
           .tab-pane{ id: 'share-with-group-pane', role: 'tabpanel' }
             = render 'projects/project_members/new_shared_group', tab_title: 'Share with group'
->>>>>>> ce-com/master
 
         = render 'shared/members/requests', membership_source: @project, requesters: @requesters
         .clearfix