Ignore:
Timestamp:
02/08/22 23:27:06 (2 years ago)
Author:
andrejTavchioski <andrej.tavchioski@…>
Branches:
master
Children:
ad4da86
Parents:
c71fa06 (diff), 80ddcae (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of https://develop.finki.ukim.mk/git/ParkUp

# Conflicts:
# sources/app/src/main/java/parkup/data/WorkerDemoParkingZones.java

File:
1 edited

Legend:

Unmodified
Added
Removed
  • sources/app/src/main/resources/application.properties

    rc71fa06 r0c049e9  
    11spring.datasource.url=jdbc:postgresql://localhost:5432/parkupdb
    22spring.datasource.username=postgres
    3 spring.datasource.password=1234
    4 spring.jpa.hibernate.ddl-auto=update
     3spring.datasource.password=Lampion123
     4spring.jpa.hibernate.ddl-auto=create-drop
    55spring.jpa.show-sql=true
    66spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
Note: See TracChangeset for help on using the changeset viewer.