Skip to content

Commit fc6b35f

Browse files
resolve conflicts
2 parents d613799 + 0d29b63 commit fc6b35f

28 files changed

Lines changed: 1184 additions & 3708 deletions

File tree

integration/graphql/package-lock.json

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

integration/graphql/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"dependencies": {
1212
"@nestjs/common": "6.5.2",
1313
"@nestjs/core": "6.5.2",
14-
"@nestjs/graphql": "6.2.5",
14+
"@nestjs/graphql": "6.4.0",
1515
"apollo-server-express": "2.6.9",
1616
"graphql": "14.4.2",
1717
"graphql-tools": "4.0.5",

integration/mongoose/package-lock.json

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

integration/mongoose/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"@nestjs/common": "6.5.2",
1313
"@nestjs/core": "6.5.2",
1414
"@nestjs/mongoose": "6.1.2",
15-
"mongoose": "5.6.4",
15+
"mongoose": "5.6.5",
1616
"reflect-metadata": "0.1.13",
1717
"rxjs": "6.5.2",
1818
"typescript": "3.5.3"

0 commit comments

Comments
 (0)