fix: merge conflict error

matt-FFFFFF · matt-FFFFFF · commit 11bc7fd1832f · 2025-12-02T13:43:44.000Z
diff --git a/modules/azure/variables.tf b/modules/azure/variables.tf
@@ -473,7 +473,6 @@ variable "container_registry_dockerfile_name" {
     Typically 'Dockerfile' or a specific variant like 'dockerfile', 'Dockerfile.ubuntu', etc.
   EOT
   type        = string
-  description = "The dockerfile to build"
   default     = "Dockerfile"
 }
 

Original file line number	Diff line number	Diff line change
`@@ -473,7 +473,6 @@ variable "container_registry_dockerfile_name" {`
`473`	`473`	`Typically 'Dockerfile' or a specific variant like 'dockerfile', 'Dockerfile.ubuntu', etc.`
`474`	`474`	`EOT`
`475`	`475`	`type = string`
`476`		`- description = "The dockerfile to build"`
`477`	`476`	`default = "Dockerfile"`
`478`	`477`	`}`
`479`	`478`