Update _key_details.html.haml

Resolve conflict by keeping EE-specific changes

app/views/profiles/keys/_key_details.html.haml

@@ -24,9 +24,5 @@
       = @key.key
   .col-md-12
     .float-right
-<<<<<<< HEAD
       - unless @key.is_a? LDAPKey
         = link_to 'Remove', path_to_key(@key, is_admin), data: {confirm: 'Are you sure?'}, method: :delete, class: "btn btn-remove delete-key qa-delete-key-button"
-=======
-      = link_to 'Remove', path_to_key(@key, is_admin), data: {confirm: 'Are you sure?'}, method: :delete, class: "btn btn-remove delete-key qa-delete-key-button"
->>>>>>> upstream/master