Fix conflicts for ce-to-ee-2018-09-19

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

app/views/admin/users/index.html.haml

@@ -31,10 +31,7 @@
                 = sort_title_recently_updated
               = link_to admin_users_path(sort: sort_value_oldest_updated, filter: params[:filter]) do
                 = sort_title_oldest_updated
-<<<<<<< HEAD
         = link_to 'Send email to users', admin_email_path, class: 'btn'
-=======
->>>>>>> upstream/master
         = link_to 'New user', new_admin_user_path, class: 'btn btn-success btn-search'
 
     .top-area.scrolling-tabs-container.inner-page-scroll-tabs

app/views/projects/mirrors/_mirror_repos.html.haml

@@ -31,11 +31,7 @@
             = label_tag :only_protected_branches, _('Only mirror protected branches'), class: 'form-check-label'
             = link_to icon('question-circle'), help_page_path('user/project/protected_branches'), target: '_blank'
 
-<<<<<<< HEAD
-        .card-footer
-=======
         .panel-footer
->>>>>>> upstream/master
           = f.submit _('Mirror repository'), class: 'btn btn-success', name: :update_remote_mirror
 
     .card

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

@@ -18,9 +18,5 @@
           = text_field_tag :expires_at, nil, class: 'form-control js-access-expiration-date', placeholder: 'Expiration date'
           %i.clear-icon.js-clear-input
       = f.submit "Add to project", class: "btn btn-success"
-<<<<<<< HEAD
       - if can?(current_user, :admin_project_member, @project) && !membership_locked?
         = link_to "Import", import_project_project_members_path(@project), class: "btn btn-default", title: "Import members from another project"
-=======
-      = link_to "Import", import_project_project_members_path(@project), class: "btn btn-default", title: "Import members from another project"
->>>>>>> upstream/master