resolved conflicts
This commit is contained in:
@@ -6,11 +6,11 @@ spring.datasource.driver-class-name=org.postgresql.Driver
|
|||||||
|
|
||||||
# JPA Configuration
|
# JPA Configuration
|
||||||
spring.h2.console.enabled=true
|
spring.h2.console.enabled=true
|
||||||
base-url=http://bandi-api.gepafin.it
|
base-url=https://bandi-api.gepafin.it
|
||||||
|
|
||||||
isVatCheckGloballyDisabled = false
|
isVatCheckGloballyDisabled = false
|
||||||
#fe.base.url=http://gepafin-production-fe.s3-website.eu-central-1.amazonaws.com
|
#fe.base.url=http://gepafin-production-fe.s3-website.eu-central-1.amazonaws.com
|
||||||
fe.base.url=http://bandi.gepafin.it
|
fe.base.url=https://bandi.gepafin.it
|
||||||
#SPID configuration
|
#SPID configuration
|
||||||
spid.ipd.base.url=https://login.regione.umbria.it
|
spid.ipd.base.url=https://login.regione.umbria.it
|
||||||
active.profile.folder=production
|
active.profile.folder=production
|
||||||
Reference in New Issue
Block a user