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

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

@@ -3,7 +3,6 @@
 
 .row.prepend-top-default
   .col-lg-12
-<<<<<<< HEAD
     - if project_can_be_shared?
       %h4
         Project members
@@ -34,35 +33,6 @@
           .invite-member= render 'projects/project_members/new_project_member', tab_title: 'Add member'
         - elsif @project.allowed_to_share_with_group?
           .invite-group= render 'projects/project_members/new_project_group', tab_title: 'Invite group'
-=======
-    %h4
-      Project members
-    - if can?(current_user, :admin_project_member, @project)
-      %p
-        You can invite a new member to
-        %strong= @project.name
-        or invite another group.
-    - else
-      %p
-        Members can be added by project
-        %i Maintainers
-        or
-        %i Owners
-    .light
-      - 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: '#invite-member-pane', id: 'invite-member-tab', data: { toggle: 'tab' }, role: 'tab' } Invite member
-          - if @project.allowed_to_share_with_group?
-            %li.nav-tab{ role: 'presentation' }
-              %a.nav-link{ href: '#invite-group-pane', id: 'invite-group-tab', data: { toggle: 'tab' }, role: 'tab' } Invite group
-
-        .tab-content.gitlab-tab-content
-          .tab-pane.active{ id: 'invite-member-pane', role: 'tabpanel' }
-            = render 'projects/project_members/new_project_member', tab_title: 'Invite member'
-          .tab-pane{ id: 'invite-group-pane', role: 'tabpanel' }
-            = render 'projects/project_members/new_project_group', tab_title: 'Invite group'
->>>>>>> upstream/master
 
         = render 'shared/members/requests', membership_source: @project, requesters: @requesters
         .clearfix