Commit fcc8ce26 authored by Mayra Cabrera's avatar Mayra Cabrera

Fixes conflicts on Platform::Kubernetes

parent 0b13228c
...@@ -7,11 +7,8 @@ module Clusters ...@@ -7,11 +7,8 @@ module Clusters
include ReactiveCaching include ReactiveCaching
include EnumWithNil include EnumWithNil
<<<<<<< HEAD
prepend EE::KubernetesService prepend EE::KubernetesService
=======
>>>>>>> upstream/master
RESERVED_NAMESPACES = %w(gitlab-managed-apps).freeze RESERVED_NAMESPACES = %w(gitlab-managed-apps).freeze
self.table_name = 'cluster_platforms_kubernetes' self.table_name = 'cluster_platforms_kubernetes'
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment