mirror of
https://github.com/GSA/notifications-admin.git
synced 2026-08-23 15:57:23 -04:00
resolve conflicts
This commit is contained in:
@@ -43,6 +43,16 @@ module "logo_upload_bucket" {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
# This is the old form which used cfcommunity as a provider
|
||||||
|
# module "logo_upload_bucket_old" {
|
||||||
|
# source = "github.com/GSA-TTS/terraform-cloudgov//s3?ref=v1.0.0"
|
||||||
|
|
||||||
|
# cf_org_name = local.cf_org_name
|
||||||
|
# cf_space_name = local.cf_space_name
|
||||||
|
# name = "${local.app_name}-logo-upload-bucket-${local.env}"
|
||||||
|
# }
|
||||||
|
|
||||||
|
|
||||||
module "api_network_route" {
|
module "api_network_route" {
|
||||||
source = "../shared/container_networking"
|
source = "../shared/container_networking"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user