Fix conflict in app/views/projects/branches/new.html.haml

app/views/projects/branches/new.html.haml

@@ -11,20 +11,12 @@
 
 = form_tag namespace_project_branches_path, method: :post, id: "new-branch-form", class: "js-create-branch-form js-requires-input" do
   .form-group.row
-<<<<<<< HEAD
-    = label_tag :branch_name, nil, class: 'col-form-label'
-=======
     = label_tag :branch_name, nil, class: 'col-form-label col-sm-2'
->>>>>>> gitlab-ce/master
     .col-sm-10
       = text_field_tag :branch_name, params[:branch_name], required: true, autofocus: true, class: 'form-control js-branch-name'
       .form-text.text-muted.text-danger.js-branch-name-error
   .form-group.row
-<<<<<<< HEAD
-    = label_tag :ref, 'Create from', class: 'col-form-label'
-=======
     = label_tag :ref, 'Create from', class: 'col-form-label col-sm-2'
->>>>>>> gitlab-ce/master
     .col-sm-10.create-from
       .dropdown
         = hidden_field_tag :ref, default_ref