From 918871eaf59d29f44b7d37f8c7f7a0d91775dc91 Mon Sep 17 00:00:00 2001
From: "Matthew C. Morgan" <matthew.c.morgan@census.gov>
Date: Thu, 27 Feb 2025 13:53:47 -0500
Subject: [PATCH] namespaces

---
 .../vpc/platform-eng-eks-mcm/eks-k8s-dashboard/terragrunt.hcl | 4 ----
 1 file changed, 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
index 285b53e9..1d02df66 100644
--- 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)
 }