Fix conflict in app/views/admin/projects/show.html.haml

app/views/admin/projects/show.html.haml

@@ -118,11 +118,7 @@
       .card-body
         = form_for @project, url: transfer_admin_project_path(@project), method: :put do |f|
           .form-group.row
-<<<<<<< HEAD
-            = f.label :new_namespace_id, "Namespace", class: 'col-form-label'
-=======
             = f.label :new_namespace_id, "Namespace", class: 'col-form-label col-sm-2'
->>>>>>> gitlab-ce/master
             .col-sm-10
               .dropdown
                 = dropdown_toggle('Search for Namespace', { toggle: 'dropdown', field_name: 'new_namespace_id' }, { toggle_class: 'js-namespace-select large' })