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

5958201e · Clement Ho · 60f72071 · 5958201e
Commit 5958201e authored May 25, 2018 by Clement Ho
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

app/views/shared/_new_commit_form.html.haml app/views/shared/_new_commit_form.html.haml +0 -4

No files found.
--- a/app/views/shared/_new_commit_form.html.haml
+++ b/app/views/shared/_new_commit_form.html.haml
@@ -8,11 +8,7 @@
 - else
  - if can?(current_user, :push_code, @project)
    .form-group.row.branch
-<<<<<<< HEAD
-      = label_tag 'branch_name', _('Target Branch'), class: 'col-form-label'
-=======
      = label_tag 'branch_name', _('Target Branch'), class: 'col-form-label col-sm-2'
->>>>>>> gitlab-ce/master
      .col-sm-10
        = text_field_tag 'branch_name', branch_name, required: true, class: "form-control js-branch-name ref-name"