Resolve conflicts in app/views/devise/shared/_tabs_ldap.html.haml

app/views/devise/shared/_tabs_ldap.html.haml

@@ -2,12 +2,9 @@
   - if crowd_enabled?
     %li.nav-item
       = link_to "Crowd", "#crowd", class: "nav-link #{active_when(form_based_auth_provider_has_active_class?(:crowd))}", 'data-toggle' => 'tab'
-<<<<<<< HEAD
   - if kerberos_enabled?
     %li.nav-item
       = link_to "Kerberos", "#kerberos", class: "nav-link #{active_when(form_based_auth_provider_has_active_class?(:kerberos))}", 'data-toggle' => 'tab'
-=======
->>>>>>> upstream/master
   - @ldap_servers.each_with_index do |server, i|
     %li.nav-item
       = link_to server['label'], "##{server['provider_name']}", class: "nav-link #{active_when(i.zero? && form_based_auth_provider_has_active_class?(:ldapmain))} qa-ldap-tab", 'data-toggle' => 'tab'