Fix conflict in app/views/projects/commits/_commit.html.haml

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

@@ -31,19 +31,11 @@
           = link_to commit.title, project_commit_path(project, commit.id, merge_request_iid: merge_request.iid), class: "commit-row-message item-title"
         - else
           = link_to_markdown_field(commit, :title, link, class: "commit-row-message item-title")
-<<<<<<< HEAD
-        %span.commit-row-message.d-inline.d-sm-none
-          &middot;
-          = commit.short_id
-        - if commit.status(ref)
-          .d-inline.d-sm-none
-=======
         %span.commit-row-message.d-block.d-sm-none
           &middot;
           = commit.short_id
         - if commit.status(ref)
           .d-block.d-sm-none
->>>>>>> gitlab-ce/master
             = render_commit_status(commit, ref: ref)
         - if commit.description?
           %button.text-expander.d-none.d-sm-inline-block.js-toggle-button{ type: "button" } ...