Fix conflict in app/views/admin/users/index.html.haml

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

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

@@ -23,10 +23,7 @@
               - users_sort_options_hash.each do |value, title|
                 = link_to admin_users_path(sort: value, filter: params[:filter], search_query: params[:search_query]) do
                   = title
-<<<<<<< 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