Resolve merge conflicts from Train-Scheduling

This commit is contained in:
hagiye
2026-06-08 16:51:29 +03:00
563 changed files with 55089 additions and 9929 deletions

View File

@@ -17,11 +17,13 @@
},
"dependencies": {
"@edr/api-common": "workspace:*",
"@edr/payment-providers": "workspace:*",
"@edr/types": "workspace:*",
"@nestjs/axios": "^4.0.1",
"@nestjs/common": "^11.0.0",
"@nestjs/config": "^4.0.0",
"@nestjs/core": "^11.0.0",
"@nestjs/event-emitter": "^2.0.4",
"@nestjs/mapped-types": "^2.1.1",
"@nestjs/microservices": "^11.0.0",
"@nestjs/platform-express": "^11.0.0",
@@ -63,7 +65,7 @@
"ts-loader": "^9.5.1",
"ts-node": "^10.9.2",
"tsconfig-paths": "^4.2.0",
"typeorm": "^1.0.0",
"typeorm": "^0.3.30",
"typescript": "^5.5.4"
},
"jest": {