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

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

app/views/projects/clusters/_tabs.html.haml

@@ -14,11 +14,8 @@
       = link_to project_clusters_path(@project), class: "js-all-tab" do
         = s_("ClusterIntegration|All")
         %span.badge= @all_count
-<<<<<<< HEAD
-=======
   .nav-controls
     - if @project.feature_available?(:multiple_clusters)
       = link_to s_("ClusterIntegration|Add cluster"), new_project_cluster_path(@project), class: "btn btn-success btn-add-cluster has-tooltip js-add-cluster"
     - else
       = link_to s_("ClusterIntegration|Add cluster"), new_project_cluster_path(@project), class: "btn btn-success btn-add-cluster disabled has-tooltip js-add-cluster", title: s_("ClusterIntegration|Multiple clusters are available in GitLab Entreprise Edition Premium and Ultimate")
->>>>>>> origin/master