Fix conflict in app/views/shared/_clone_panel.html.haml

app/views/shared/_clone_panel.html.haml

@@ -23,10 +23,7 @@
   = text_field_tag :project_clone, default_url_to_repo(project), class: "js-select-on-focus form-control", readonly: true, aria: { label: 'Project clone URL' }
   .input-group-append
     = clipboard_button(target: '#project_clone', title: _("Copy URL to clipboard"), class: "input-group-text btn-default btn-clipboard")
-<<<<<<< HEAD
 
     = geo_button(modal_target: '#modal-geo-info') if Gitlab::Geo.secondary?
 
 = render 'shared/geo_info_modal', project: project if Gitlab::Geo.secondary?
-=======
->>>>>>> gitlab-ce/master