Fix conflict in app/views/profiles/keys/_key_details.html.haml

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"
-=======
-      = link_to 'Remove', path_to_key(@key, is_admin), data: {confirm: 'Are you sure?'}, method: :delete, class: "btn btn-remove delete-key"
->>>>>>> gitlab-ce/master
+        = link_to 'Remove', path_to_key(@key, is_admin), data: {confirm: 'Are you sure?'}, method: :delete, class: "btn btn-remove delete-key"
\ No newline at end of file