From f8163ea9250cf37cd945033d962c8f319cd94618 Mon Sep 17 00:00:00 2001
From: "Matthew C. Morgan" <matthew.c.morgan@census.gov>
Date: Fri, 31 Jan 2025 18:47:11 -0500
Subject: [PATCH] since we do not need outputs consider using dependencies
 block instead

---
 lab/_envcommon/helm-provider.hcl | 2 --
 lab/_envcommon/kube-provider.hcl | 2 --
 2 files changed, 4 deletions(-)

diff --git a/lab/_envcommon/helm-provider.hcl b/lab/_envcommon/helm-provider.hcl
index b582032..7e693ce 100644
--- a/lab/_envcommon/helm-provider.hcl
+++ b/lab/_envcommon/helm-provider.hcl
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 generate "helm-provider" {
   path      = "helm-provider.tf"
   if_exists = "overwrite"
@@ -23,7 +22,6 @@ data "aws_eks_cluster" "this" {
 %{ endif }
 EOF
 }
-=======
 dependency "eks" {
   config_path = "${get_original_terragrunt_dir()}/../eks"
 }
diff --git a/lab/_envcommon/kube-provider.hcl b/lab/_envcommon/kube-provider.hcl
index fe6d085..06e8051 100644
--- a/lab/_envcommon/kube-provider.hcl
+++ b/lab/_envcommon/kube-provider.hcl
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 generate "kube-provider" {
   path      = "kube-provider.tf"
   if_exists = "overwrite"
@@ -21,7 +20,6 @@ data "aws_eks_cluster" "this" {
 %{ endif }
 EOF
 }
-=======
 dependency "eks" {
   config_path = "${get_original_terragrunt_dir()}/../eks"
 }