Fix conflicts in translated files

app/helpers/button_helper.rb

@@ -61,12 +61,8 @@ module ButtonHelper
         html: true,
         placement: placement,
         container: 'body',
-<<<<<<< HEAD
         title: _("Set a password on your account to pull or push via %{protocol}") % { protocol: protocol },
         primary_url: (geo_primary_http_url_to_repo(project) if Gitlab::Geo.secondary?)
-=======
-        title: _("Set a password on your account to pull or push via %{protocol}") % { protocol: protocol }
->>>>>>> ce-com/master
       }
   end
 

app/views/projects/commits/_head.html.haml

@@ -34,11 +34,8 @@
         = nav_link(path: 'graphs#charts') do
           = link_to charts_namespace_project_graph_path(@project.namespace, @project, current_ref) do
             #{ _('Charts') }
-<<<<<<< HEAD
 
         - if @project.feature_available?(:file_lock)
           = nav_link(controller: [:path_locks]) do
             = link_to namespace_project_path_locks_path(@project.namespace, @project) do
               Locked Files
-=======
->>>>>>> ce-com/master

app/views/shared/_clone_panel.html.haml

@@ -23,11 +23,8 @@
   = 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-btn
     = clipboard_button(target: '#project_clone', title: _("Copy URL to clipboard"))
-<<<<<<< HEAD
 
     = geo_button(modal_target: '#modal-geo-info') if Gitlab::Geo.secondary?
-=======
->>>>>>> ce-com/master
 
 :javascript
   $('ul.clone-options-dropdown a').on('click',function(e){