fix conflicts

KUIT-Couphone · Aug 5, 2023 · 4e23447 · 4e23447
2 parents 79ec560 + d40ff54
commit 4e23447
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,7 +4,7 @@ build/
 !gradle/wrapper/gradle-wrapper.jar
 !**/src/main/**/build/
 !**/src/test/**/build/
-**.pemsssssssss
+**.pem
 
 ### STS ###
 .apt_generated
@@ -103,4 +103,4 @@ $RECYCLE.BIN/
 # akfrdma0125#
 convention.md
 
-# End of https://www.toptal.com/developers/gitignore/api/windows,macos
+# End of https://www.toptal.com/developers/gitignore/api/windows,macos
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -88,4 +88,4 @@ spring:
  resources:
  add-mappings: false
  messages:
- basename: errors
+ basename: errors
diff --git a/src/test/resources/application.yml b/src/test/resources/application.yml
@@ -20,6 +20,7 @@ logging:
  util:
  EC2MetadataUtils: ERROR
 spring:
+ geocoder: ${GEOCODER_API_KEY}
  servlet:
  multipart:
  max-file-size: 5MB
@@ -43,7 +44,7 @@ spring:
  sql:
  init:
  platform: mysql
- mode: never
+ mode: always
 
 ---
 spring:
@@ -59,6 +60,8 @@ spring:
  activate:
  on-profile: JPA
  jpa:
+ database: mysql
+ database-platform: org.hibernate.dialect.MySQLDialect
  hibernate:
  database-platform: org.hibernate.dialect.MySQLDialect
  ddl-auto: create
@@ -86,4 +89,4 @@ spring:
  resources:
  add-mappings: false
  messages:
- basename: errors
+ basename: errors