a

Author: Xarlifue360

backend/gamelink/src/main/resources/application.properties

@@ -10,11 +10,7 @@ spring.mustache.suffix=.html
 
 spring.datasource.url=jdbc:postgresql://localhost:5432/gamelink
 spring.datasource.username=postgres
-<<<<<<< HEAD
 spring.datasource.password=123456
-=======
-spring.datasource.password=Juanluis-123
->>>>>>> 93075e63aa4379be2432267d194a48b49d64a983
 spring.jpa.hibernate.ddl-auto=create-drop
 
 logging.level.org.springframework.security=DEBUG