Skip to content

Commit 4399402

Browse files
fix(): solve merge conflicts
2 parents a89d204 + d6aa272 commit 4399402

16 files changed

Lines changed: 1057 additions & 715 deletions

File tree

integration/typegraphql/package-lock.json

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

integration/typegraphql/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"reflect-metadata": "0.1.13",
2121
"rxjs": "6.5.3",
2222
"subscriptions-transport-ws": "0.9.16",
23-
"type-graphql": "0.17.5",
23+
"type-graphql": "0.17.6",
2424
"typescript": "3.7.2",
2525
"ws": "7.2.1"
2626
},

0 commit comments

Comments
 (0)