Fix conflict in app/views/projects/blob/_new_dir.html.haml

app/views/projects/blob/_new_dir.html.haml

@@ -7,11 +7,7 @@
       .modal-body
         = form_tag project_create_dir_path(@project, @id), method: :post, remote: false, class: 'js-create-dir-form js-quick-submit js-requires-input' do
           .form-group.row
-<<<<<<< HEAD
-            = label_tag :dir_name, _('Directory name'), class: 'col-form-label'
-=======
             = label_tag :dir_name, _('Directory name'), class: 'col-form-label col-sm-2'
->>>>>>> gitlab-ce/master
             .col-sm-10
               = text_field_tag :dir_name, params[:dir_name], required: true, class: 'form-control'