no message

src/main/resources/application.properties

-server.port=8081
+#server.port=8081
 # ===============================
 # DATABASE CONNECTION
 # ===============================
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.url=jdbc:mysql://localhost:3306/qtvp_01
+spring.datasource.url=jdbc:mysql://localhost:3306/quantrivanphong
 spring.datasource.username=root
-<<<<<<< HEAD
 spring.datasource.password=ahihi123
-=======
-spring.datasource.password=12345678
->>>>>>> master
 
 spring.jpa.show-sql=true
 spring.jpa.hibernate.ddl-auto=update
-<<<<<<< HEAD
 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL57Dialect
 spring.jpa.properties.hibernate.default_schema=quantrivanphong
-=======
-spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect
->>>>>>> master
 
 
 spring.mail.host=smtp.gmail.com