Merge branch 'feat/dev' of katelynne/JhipsterGroupProject-Server into master

src/main/resources/config/application-dev.yml

@@ -49,9 +49,10 @@ spring:
         password:
         hikari:
             auto-commit: false
+        platform: h2
     h2:
         console:
-            enabled: false
+            enabled: true
     jpa:
         database-platform: io.github.jhipster.domain.util.FixedH2Dialect
         database: H2

src/main/resources/config/application.yml

@@ -66,10 +66,9 @@ spring:
         properties:
             hibernate.jdbc.time_zone: UTC
         hibernate:
-<<<<<<< HEAD
-=======
+
             ddl-auto: none
->>>>>>> e643360c0b2a6c07e30a791e98c6c624e8cc0a81
+
             naming:
                 physical-strategy: org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy
                 implicit-strategy: org.springframework.boot.orm.jpa.hibernate.SpringImplicitNamingStrategy