resolved conflicts
This commit is contained in:
@@ -4,7 +4,7 @@ spring.application.name=tendermanagement
|
||||
spring.servlet.multipart.max-file-size=15MB
|
||||
spring.servlet.multipart.max-request-size=15MB
|
||||
|
||||
spring.profiles.active=testing
|
||||
spring.profiles.active=local
|
||||
|
||||
|
||||
# JPA Configuration
|
||||
|
||||
@@ -247,4 +247,6 @@ get.signed.document.file.success=Signed document file retrieved successfully.
|
||||
application.signed.document.not.found=Signed document for the application not found.
|
||||
delete.signed.document.file.success=Signed document deleted successfully.
|
||||
|
||||
dashboard.widget.fetched.successfully=Dasboard widget fetched sucessfully.
|
||||
|
||||
|
||||
|
||||
@@ -243,4 +243,5 @@ get.signed.document.file.success=File del documento firmato recuperato con succe
|
||||
application.signed.document.not.found=Documento firmato per l'applicazione non trovato.
|
||||
delete.signed.document.file.success=Documento firmato eliminato con successo.
|
||||
|
||||
dashboard.widget.fetched.successfully=Widget dashboard recuperato correttamente.
|
||||
|
||||
|
||||
Reference in New Issue
Block a user