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

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

@@ -6,12 +6,9 @@
       = link_to user.name, [:admin, user]
     - if user.blocked?
       %span.badge.badge-danger blocked
-<<<<<<< HEAD
     - if user.note.present?
       = link_to "#", { "data-toggle" => "tooltip", title: user.note, class: "user-note"} do
         = icon("sticky-note-o cgrey")
-=======
->>>>>>> gitlab-ce/master
     - if user.admin?
       %span.badge.badge-success Admin
     - if user.external?