Fix conflict in app/views/projects/settings/repository/show.html.haml

Signed-off-by: Rémy Coutable <remy@rymai.me>

app/views/projects/settings/repository/show.html.haml

@@ -5,12 +5,9 @@
 - content_for :page_specific_javascripts do
   = webpack_bundle_tag('common_vue')
   = webpack_bundle_tag('deploy_keys')
-<<<<<<< HEAD
 
 = render "projects/push_rules/index"
 = render "projects/mirrors/show"
-=======
->>>>>>> upstream/master
 
 -# Protected branches & tags use a lot of nested partials.
 -# The shared parts of the views can be found in the `shared` directory.