Resolve conflicts in app/views/admin/dashboard/index.html.haml

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

@@ -23,12 +23,9 @@
               %h3.text-center
                 Users:
                 = approximate_count_with_delimiters(User)
-<<<<<<< HEAD
             -# EE specific
             .text-center
               = link_to 'Users statistics', admin_dashboard_stats_path
-=======
->>>>>>> upstream/master
             %hr
             = link_to 'New user', new_admin_user_path, class: "btn btn-new"
       .col-sm-4