amirho/nest
1
0
Fork 0
mirror of https://github.com/nestjs/nest.git synced 2026-02-21 23:11:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(): resolve conflicts

Browse Source
This commit is contained in:
Kamil Myśliwiec
2020-01-26 12:18:14 +01:00
parent 7309ba4bdf 5919995685
commit 01dfe29458
79 changed files with 646 additions and 708 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
integration/hooks/package-lock.json generated
View File

@@ -5,9 +5,9 @@
"requires": true,
"dependencies": {
"@nestjs/common": {
"version": "6.11.0",
"resolved": "https://registry.npmjs.org/@nestjs/common/-/common-6.11.0.tgz",
"integrity": "sha512-f+bHCFmpeSJJo3muyRyMYwCXMJuqjJvM86WrBsXfEd5ErDoicy1u7L8kzQfCSwTvUngh3taT51wYQC6RFzAWVA==",
"version": "6.11.1",
"resolved": "https://registry.npmjs.org/@nestjs/common/-/common-6.11.1.tgz",
"integrity": "sha512-ozraRypa0uA0I15lFkCuEC4BaJmruGetDW2VXuJ0hifSl98sHoj+XeZmW5QfNTl8ouPEJ46jc+HtBtyZ1IeR+A==",
"requires": {
"axios": "0.19.2",
"cli-color": "2.0.0",
@@ -16,9 +16,9 @@
}
},
"@nestjs/core": {
"version": "6.11.0",
"resolved": "https://registry.npmjs.org/@nestjs/core/-/core-6.11.0.tgz",
"integrity": "sha512-2S4HNEdAFPQJIrG7nclMy2OREhZqQIzd2kwhrPDC2mEcfuibEZCiGAyH4hbfaf1lFf0D9+wdu5PHsY/aDHF6Zg==",
"version": "6.11.1",
"resolved": "https://registry.npmjs.org/@nestjs/core/-/core-6.11.1.tgz",
"integrity": "sha512-pznpX6CzMkMeIilVDntEqmOJLwRA+GACBwD3GW1AJVaIe3xx2QlsClByiGz04vxKADUJvSC+EqJpUbx7ROTAHg==",
"requires": {
"@nuxtjs/opencollective": "0.2.2",
"fast-safe-stringify": "2.0.7",

4
integration/hooks/package.json
View File

@@ -7,8 +7,8 @@
"start": "ts-node src/main"
},
"dependencies": {
"@nestjs/common": "6.11.0",
"@nestjs/core": "6.11.0",
"@nestjs/common": "6.11.1",
"@nestjs/core": "6.11.1",
"class-transformer": "0.2.3",
"class-validator": "0.11.0",
"reflect-metadata": "0.1.13",