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

dd4ac348 · Clement Ho · aaa50474 · dd4ac348
Commit dd4ac348 authored May 25, 2018 by Clement Ho
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/views/admin/users/_user.html.haml app/views/admin/users/_user.html.haml +0 -3

No files found.
--- a/app/views/admin/users/_user.html.haml
+++ b/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?