remove extra tomap()s

SCT-Engineering · Apr 18, 2025 · 5ea4a63 · 5ea4a63
1 parent b9e4079
commit 5ea4a63
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/security_groups.tf b/security_groups.tf
@@ -10,11 +10,7 @@ resource "aws_security_group" "additional_eks_cluster_sg" {
   tags = merge(
     local.base_tags,
     var.tags,
-<<<<<<< HEAD
     { "Name" = local.additional_eks_cluster_sg_name },
-=======
-    tomap({ "Name" = local.additional_eks_cluster_sg_name }),
->>>>>>> ddd6d64 (align with upstream)
   )
 
   vpc_id = data.aws_vpc.eks_vpc.id