From 1cda24ca7c280967358b791311709242aa8647ff Mon Sep 17 00:00:00 2001 From: Dipti Pai Date: Tue, 27 Aug 2024 09:04:23 -0700 Subject: [PATCH] Fix merge conflict in outputs.tf Signed-off-by: Dipti Pai --- tf-modules/azure/devops/outputs.tf | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/tf-modules/azure/devops/outputs.tf b/tf-modules/azure/devops/outputs.tf index 0d7a830..6801fcd 100644 --- a/tf-modules/azure/devops/outputs.tf +++ b/tf-modules/azure/devops/outputs.tf @@ -1,6 +1,4 @@ output "repo_url" { -<<<<<<< HEAD -<<<<<<< HEAD description = "Azure Devops Git repository HTTPS url" value = azuredevops_git_repository.application.remote_url } @@ -9,23 +7,3 @@ output "project_id" { description = "Azure Devops Project ID" value = azuredevops_project.project.id } -======= - description = "Azure Devops Git repository HTTPS url" - value = azuredevops_git_repository.application.remote_url -} - -output "project_id" { - description = "Azure Devops Project ID" - value = azuredevops_project.project.id -} ->>>>>>> 5d9335c (Add project_id to devops TF output) -======= - description = "Azure Devops Git repository HTTPS url" - value = azuredevops_git_repository.application.remote_url -} - -output "project_id" { - description = "Azure Devops Project ID" - value = azuredevops_project.project.id -} ->>>>>>> 365b59d (Format the terraform files, use latest versions and remove tags)