10-11-25 after conflict

2025-11-10 11:56:29 +05:30
parent c67f222957 43baedfecd
commit 98e9a7447c
77 changed files with 1600 additions and 572 deletions
@@ -20,7 +20,11 @@ swagger.server.description=Local Development Server
 # DataSource
 spring.datasource.url=jdbc:postgresql://localhost:5432/BBPS
 spring.datasource.username=postgres
+<<<<<<< HEAD
 spring.datasource.password=UAT@DB_2025
+=======
+spring.datasource.password=himanshu@123
+>>>>>>> 43baedfecdf5e3718ba3e8b932536b3798957d22
 spring.datasource.driver-class-name=org.postgresql.Driver
 spring.datasource.type=com.zaxxer.hikari.HikariDataSource