fix: merge conflict

kakao-tech-campus-2nd-step3 · Nov 15, 2024 · e632c79 · e632c79
2 parents 1d3160c + 69d1c90
commit e632c79
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -18,12 +18,12 @@ spring:
     # password: ${DB_PASSWORD}
 
   servlet:
-      multipart:
-        file-size-threshold: 1MB
-        location : .
-        max-file-size: 10MB
-        max-request-size : 50MB
-        enabled : true
+    multipart:
+      file-size-threshold: 1MB
+      location : .
+      max-file-size: 10MB
+      max-request-size : 50MB
+      enabled : true
 
   jpa:
     hibernate: