Fix conflict in app/views/projects/pipelines/_with_tabs.html.haml

app/views/projects/pipelines/_with_tabs.html.haml

@@ -16,14 +16,11 @@
         = link_to failures_project_pipeline_path(@project, @pipeline), data: { target: '#js-tab-failures', action: 'failures', toggle: 'tab' }, class: 'failures-tab' do
           = _("Failed Jobs")
           %span.badge.badge-pill.js-failures-counter= @pipeline.failed_builds.count
-<<<<<<< HEAD
     - if expose_sast_data || expose_dependency_data
       %li.js-security-tab-link
         = link_to security_project_pipeline_path(@project, @pipeline), data: { target: '#js-tab-security', action: 'security', toggle: 'tab' }, class: 'security-tab' do
           = _("Security report")
           %span.badge.badge-pill.js-sast-counter.hidden
-=======
->>>>>>> gitlab-ce/master
 
 .tab-content
   #js-tab-pipeline.tab-pane