Resolve conflict in app/views/projects/clusters/index.html.haml

1d07fec4 · Winnie Hellmann · 483cfb7a · 1d07fec4
Commit 1d07fec4 authored Feb 06, 2018 by Winnie Hellmann
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/views/projects/clusters/index.html.haml app/views/projects/clusters/index.html.haml +0 -3

No files found.
--- a/app/views/projects/clusters/index.html.haml
+++ b/app/views/projects/clusters/index.html.haml
@@ -8,10 +8,7 @@
    .top-area.adjust
      .nav-text
        = s_("ClusterIntegration|Kubernetes clusters can be used to deploy applications and to provide Review Apps for this project")
-<<<<<<< HEAD
      = render 'projects/ee/clusters/buttons', project: @project
-=======
->>>>>>> upstream/master
    .ci-table.js-clusters-list
      .gl-responsive-table-row.table-row-header{ role: "row" }
        .table-section.section-30{ role: "rowheader" }