CCM-9874: fix conflict

harrim91 · harrim91 · commit 3133abf3d651 · 2025-05-20T14:33:20.000+01:00
diff --git a/infrastructure/terraform/modules/backend-api/variables.tf b/infrastructure/terraform/modules/backend-api/variables.tf
@@ -110,8 +110,6 @@ variable "cloudfront_distribution_arn" {
   description = "ARN of the cloudfront distribution to serve files from"
   default     = null
 }
-<<<<<<< HEAD
-=======
 
 variable "log_destination_arn" {
   type        = string
@@ -124,4 +122,3 @@ variable "log_subscription_role_arn" {
   description = "The ARN of the IAM role to use for the log subscription filter"
   default     = ""
 }
->>>>>>> main

Original file line number	Diff line number	Diff line change
`@@ -110,8 +110,6 @@ variable "cloudfront_distribution_arn" {`
`110`	`110`	`description = "ARN of the cloudfront distribution to serve files from"`
`111`	`111`	`default = null`
`112`	`112`	`}`
`113`		`-<<<<<<< HEAD`
`114`		`-=======`
`115`	`113`
`116`	`114`	`variable "log_destination_arn" {`
`117`	`115`	`type = string`
`@@ -124,4 +122,3 @@ variable "log_subscription_role_arn" {`
`124`	`122`	`description = "The ARN of the IAM role to use for the log subscription filter"`
`125`	`123`	`default = ""`
`126`	`124`	`}`
`127`		`->>>>>>> main`