fmt

SCT-Engineering · Mar 18, 2025 · a998091 · a998091
1 parent f821a2a
commit a998091
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-kiali/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-kiali/terragrunt.hcl
@@ -5,7 +5,11 @@ include "root" {
 }
 
 terraform {
+<<<<<<< HEAD
   source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-kiali.git?ref=${include.root.inputs.release_version}"
+=======
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-kiali.git?ref=mcmCluster"
+>>>>>>> 77e8f9d (fmt)
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()
     arguments = ["-lock-timeout=20s"]