fix: 병합충돌 제어

loseminho · loseminho · commit 4563fefcd806 · 2025-10-14T16:40:41.000+09:00
diff --git a/infra/terraform/variables.tf b/infra/terraform/variables.tf
@@ -1,8 +1,4 @@
 variable "catfe_domain_1" {
   description = "domain_1"
   default = "api.catfe.site"
-<<<<<<< HEAD
-=======
-
->>>>>>> 18f06f6 (Infra: EC2 환경변수 수정)
 }
