Resolve conflicts in member controllers, presenters, and views

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

app/controllers/admin/groups_controller.rb

 class Admin::GroupsController < Admin::ApplicationController
   include MembersPresentation
-<<<<<<< HEAD
+
   prepend EE::Admin::GroupsController
-=======
->>>>>>> upstream/master
 
   before_action :group, only: [:edit, :update, :destroy, :project_update, :members_update]
 

app/presenters/group_member_presenter.rb

 class GroupMemberPresenter < MemberPresenter
-<<<<<<< HEAD
   prepend EE::GroupMemberPresenter
 
-=======
->>>>>>> upstream/master
   private
 
   def admin_member_permission

app/presenters/member_presenter.rb

 class MemberPresenter < Gitlab::View::Presenter::Delegated
-<<<<<<< HEAD
   prepend EE::MemberPresenter
 
-=======
->>>>>>> upstream/master
   presents :member
 
   def access_level_roles

app/presenters/project_member_presenter.rb

 class ProjectMemberPresenter < MemberPresenter
-<<<<<<< HEAD
   prepend EE::ProjectMemberPresenter
 
-=======
->>>>>>> upstream/master
   private
 
   def admin_member_permission

app/views/shared/members/_member.html.haml

@@ -62,10 +62,7 @@
             = f.hidden_field :access_level
             .member-form-control.dropdown.append-right-5
               %button.dropdown-menu-toggle.js-member-permissions-dropdown{ type: "button",
-<<<<<<< HEAD
                 disabled: member.can_override?,
-=======
->>>>>>> upstream/master
                 data: { toggle: "dropdown", field_name: "#{f.object_name}[access_level]" } }
                 %span.dropdown-toggle-text
                   = member.human_access
@@ -85,10 +82,7 @@
                       can_override: member.can_override?
             .prepend-left-5.clearable-input.member-form-control
               = f.text_field :expires_at,
-<<<<<<< HEAD
                 disabled: member.can_override?,
-=======
->>>>>>> upstream/master
                 class: 'form-control js-access-expiration-date js-member-update-control',
                 placeholder: 'Expiration date',
                 id: "member_expires_at_#{member.id}",