fix: git merge error fix

smarketing-java/deployment/deploy_env_vars

@@ -0,0 +1,23 @@
+# Team Settings
+teamid=kros235
+root_project=smarketing-backend
+namespace=smarketing
+
+# Container Registry Settings
+registry=acrdigitalgarage02.azurecr.io
+image_org=smarketing
+
+# Application Settings
+replicas=1
+allowed_origins=http://20.249.171.38
+
+# Security Settings
+jwt_secret_key=8O2HQ13etL2BWZvYOiWsJ5uWFoLi6NBUG8divYVoCgtHVvlk3dqRksMl16toztDUeBTSIuOOPvHIrYq11G2BwQ
+postgres_user=admin
+postgres_password=Hi5Jessica!
+
+# Resource Settings (리소스 요구사항 줄임)
+resources_requests_cpu=100m
+resources_requests_memory=128Mi
+resources_limits_cpu=500m
+resources_limits_memory=512Mi