chore: resolve conflicts

This commit is contained in:
Kamil Myśliwiec
2025-01-07 12:24:10 +01:00
30 changed files with 937 additions and 306 deletions

View File

@@ -1,6 +1,6 @@
{
"name": "@nestjs/core",
"version": "10.4.15",
"version": "11.0.0-next.1",
"description": "Nest - modern, fast, powerful node.js web framework (@core)",
"author": "Kamil Mysliwiec",
"license": "MIT",
@@ -31,12 +31,12 @@
"@nuxtjs/opencollective": "0.3.2",
"fast-safe-stringify": "2.1.1",
"iterare": "1.2.1",
"path-to-regexp": "3.3.0",
"path-to-regexp": "8.2.0",
"tslib": "2.8.1",
"uid": "2.0.2"
},
"devDependencies": {
"@nestjs/common": "10.4.15"
"@nestjs/common": "^11.0.0-next.1"
},
"peerDependencies": {
"@nestjs/common": "^10.0.0",