Resolve conflict in app/views/projects/jobs/_sidebar.html.haml

Based on d19eaaed2d48e008abf94301a98e8ee806219071. Signed-off-by: Rémy Coutable <remy@rymai.me>

Resolve conflict in app/views/projects/jobs/_sidebar.html.haml
Based on d19eaaed2d48e008abf94301a98e8ee806219071. Signed-off-by: Rémy Coutable <remy@rymai.me>
f386a01d · Rémy Coutable · c67cf9de · f386a01d
Commit f386a01d authored Aug 10, 2017 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

app/views/projects/jobs/_sidebar.html.haml app/views/projects/jobs/_sidebar.html.haml +0 -4

No files found.
--- a/app/views/projects/jobs/_sidebar.html.haml
+++ b/app/views/projects/jobs/_sidebar.html.haml
@@ -68,11 +68,7 @@
          #{@build.pipeline.git_commit_title}

      - if @build.pipeline.stages_count > 1
-<<<<<<< HEAD
-        .dropdown.build-dropdown
-=======
        .block-last.dropdown.build-dropdown
->>>>>>> upstream/master
          %div
            %span{ class: "ci-status-icon-#{@build.pipeline.status}" }
              = ci_icon_for_status(@build.pipeline.status)