Fix conflict in app/views/shared/members/_requests.html.haml

99c9fd31 · Clement Ho · 46daeba9 · 99c9fd31
Commit 99c9fd31 authored May 25, 2018 by Clement Ho
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

app/views/shared/members/_requests.html.haml app/views/shared/members/_requests.html.haml +0 -4

No files found.
--- a/app/views/shared/members/_requests.html.haml
+++ b/app/views/shared/members/_requests.html.haml
@@ -4,11 +4,7 @@

 - return if requesters.empty?

-<<<<<<< HEAD
-.card.prepend-top-default{ class: ('panel-mobile' if force_mobile_view ) }
-=======
 .card.prepend-top-default{ class: ('card-mobile' if force_mobile_view ) }
->>>>>>> gitlab-ce/master
  .card-header
    Users requesting access to
    %strong= membership_source.name