christoph/lecture-professional-software-development
1
Fork 0
Code Activity

fix more conflicts

Browse Source
This commit is contained in:
killerber4t
2020-03-04 13:45:36 +01:00
parent 89196b738a
commit 13401df0ac
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/resources/application.properties
View File

@ -9,15 +9,7 @@ spring.datasource.username=root
spring.datasource.password=geheim spring.datasource.password=geheim
spring.jpa.database-platform=org.hibernate.dialect.H2Dialect spring.jpa.database-platform=org.hibernate.dialect.H2Dialect
<<<<<<< Updated upstream
keycloak.principal-attribute=preferred_username
keycloak.auth-server-url=https://keycloak.cs.hhu.de/auth
keycloak.realm=MOPS
keycloak.resource=demo
keycloak.public-client=true
=======
spring.security.user.name=root spring.security.user.name=root
spring.security.user.password=1234 spring.security.user.password=1234
spring.security.user.roles=ADMIN spring.security.user.roles=ADMIN
>>>>>>> Stashed changes