Resolve conflict in app/views/groups/group_members/index.html.haml

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

Resolve conflict in app/views/groups/group_members/index.html.haml
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2740ab03 · Dmitriy Zaporozhets · ef50ece3 · 2740ab03
Commit 2740ab03 authored May 11, 2018 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/views/groups/group_members/index.html.haml app/views/groups/group_members/index.html.haml +0 -3

No files found.
--- a/app/views/groups/group_members/index.html.haml
+++ b/app/views/groups/group_members/index.html.haml
@@ -14,11 +14,8 @@

    = render 'shared/members/requests', membership_source: @group, requesters: @requesters

-<<<<<<< HEAD
  = render 'ldap_sync'

-=======
->>>>>>> upstream/master
  .clearfix
    %h5.member.existing-title
      Existing members