Skip to content

Commit 33c4a87

Browse files
resolve conflicts
2 parents 838e0d2 + 71e43c7 commit 33c4a87

File tree

2 files changed

+26
-26
lines changed

2 files changed

+26
-26
lines changed

package-lock.json

Lines changed: 22 additions & 22 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434
},
3535
"homepage": "https://github.com/nestjs/nest-cli#readme",
3636
"dependencies": {
37-
"@angular-devkit/core": "8.1.1",
38-
"@angular-devkit/schematics": "8.1.1",
39-
"@angular-devkit/schematics-cli": "0.801.1",
37+
"@angular-devkit/core": "8.1.2",
38+
"@angular-devkit/schematics": "8.1.2",
39+
"@angular-devkit/schematics-cli": "0.801.2",
4040
"@nestjs/schematics": "^6.3.0",
4141
"chalk": "2.4.2",
4242
"cli-table3": "0.5.1",
@@ -50,7 +50,7 @@
5050
"devDependencies": {
5151
"@types/inquirer": "6.0.3",
5252
"@types/jest": "24.0.15",
53-
"@types/node": "12.6.2",
53+
"@types/node": "12.6.8",
5454
"@types/node-emoji": "1.8.1",
5555
"@types/ora": "3.1.0",
5656
"@types/os-name": "2.0.0",

0 commit comments

Comments
 (0)