Fixes conflicts on Platform::Kubernetes

fcc8ce26 · Mayra Cabrera · 0b13228c · fcc8ce26
Commit fcc8ce26 authored Oct 22, 2018 by Mayra Cabrera
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/models/clusters/platforms/kubernetes.rb app/models/clusters/platforms/kubernetes.rb +0 -3

No files found.
--- a/app/models/clusters/platforms/kubernetes.rb
+++ b/app/models/clusters/platforms/kubernetes.rb
@@ -7,11 +7,8 @@ module Clusters
      include ReactiveCaching
      include EnumWithNil
-<<<<<<< HEAD
      prepend EE::KubernetesService
-=======
->>>>>>> upstream/master
      RESERVED_NAMESPACES = %w(gitlab-managed-apps).freeze
      self.table_name = 'cluster_platforms_kubernetes'