namespaces

SCT-Engineering · Mar 18, 2025 · 918871e · 918871e
1 parent 94b86f8
commit 918871e
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-k8s-dashboard/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-k8s-dashboard/terragrunt.hcl
@@ -50,9 +50,5 @@ inputs = {
   # Dashboard Configuration
   service_name          = include.root.inputs.dashboard_hostname
   k8s_dashboard_version = include.root.inputs.k8s_dashboard_version
-<<<<<<< HEAD
   namespace             = include.root.inputs.namespaces["k8s-dashboard"]
-=======
-  namespace             = include.root.inputs.dashboard_hostname
->>>>>>> f649b29 (docs and keycloak)
 }