changes

ishikaray16 · Nov 25, 2024 · 9bf6fe8 · 9bf6fe8
1 parent e64aaa7
commit 9bf6fe8
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/shared/booksinfo/data.tf b/shared/booksinfo/data.tf
@@ -1,10 +1,7 @@
 data "tfe_outputs" "infra" {
   organization = var.tf_cloud_organization
-<<<<<<< HEAD
   workspace = "aws-infra"
-=======
-  workspace = "${coalesce(var.aws_waf_ce, "infra")}"
->>>>>>> 7759e1229d807d2da94cb1cc2c18127d452be360
+  workspace = "${coalesce(var.aws_waf_ce, "aws-infra")}"
 }
 data "tfe_outputs" "eks" {
   organization = var.tf_cloud_organization