fix conflict

navikt · Sep 1, 2023 · 2d98c82 · 2d98c82
1 parent 2ec7149
commit 2d98c82
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/apps/backend/src/main/resources/application.properties b/apps/backend/src/main/resources/application.properties
@@ -15,7 +15,7 @@ spring.datasource.username=${BACKEND_DB_USERNAME}
 spring.datasource.password=${BACKEND_DB_PASSWORD}
 spring.datasource.hikari.minimum-idle=1
 spring.datasource.hikari.maximum-pool-size=5
-#spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQL95Dialect
+#spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
 #spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true
 spring.jpa.hibernate.ddl-auto=none
 spring.jpa.open-in-view=false