Resolve conflict in app/views/projects/deploy_keys/_index.html.haml

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

app/views/projects/deploy_keys/_index.html.haml

@@ -3,11 +3,7 @@
   .settings-header
     %h4
       Deploy Keys
-<<<<<<< HEAD
     %button.btn.js-settings-toggle{ type: 'button' }
-=======
-    %button.btn.js-settings-toggle.qa-expand-deploy-keys{ type: 'button' }
->>>>>>> upstream/master
       = expanded ? 'Collapse' : 'Expand'
     %p
       Deploy keys allow read-only or read-write (if enabled) access to your repository. Deploy keys can be used for CI, staging or production servers. You can create a deploy key or add an existing one.