Skip to content

Commit 5d24da3

Browse files
kamilmysliwieckamilmysliwiec
committed
fix(): resolve merge conflicts
2 parents 3912cf3 + accf580 commit 5d24da3

58 files changed

Lines changed: 850 additions & 317 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,8 @@
105105
"@types/sinon": "7.5.1",
106106
"@types/socket.io": "2.1.4",
107107
"@types/ws": "7.2.0",
108-
"@typescript-eslint/eslint-plugin": "^2.17.0",
109-
"@typescript-eslint/parser": "^2.17.0",
108+
"@typescript-eslint/eslint-plugin": "2.17.0",
109+
"@typescript-eslint/parser": "2.17.0",
110110
"artillery": "1.6.0-29",
111111
"awesome-typescript-loader": "5.2.1",
112112
"body-parser": "1.19.0",
@@ -121,9 +121,9 @@
121121
"coveralls": "3.0.9",
122122
"csv-write-stream": "2.0.0",
123123
"delete-empty": "3.0.0",
124-
"eslint": "^6.8.0",
125-
"eslint-config-prettier": "^6.9.0",
126-
"eslint-plugin-import": "^2.20.0",
124+
"eslint": "6.8.0",
125+
"eslint-config-prettier": "6.9.0",
126+
"eslint-plugin-import": "2.20.0",
127127
"fancy-log": "1.3.3",
128128
"fastify-static": "2.5.1",
129129
"gulp": "4.0.1",

‎sample/01-cats-app/package-lock.json‎

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

‎sample/01-cats-app/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"tsconfig-paths": "3.9.0",
4646
"@typescript-eslint/eslint-plugin": "2.12.0",
4747
"@typescript-eslint/parser": "2.12.0",
48-
"eslint": "6.7.2",
48+
"eslint": "6.8.0",
4949
"eslint-config-prettier": "6.7.0",
5050
"eslint-plugin-import": "2.19.1",
5151
"typescript": "3.7.2"

‎sample/02-gateways/package-lock.json‎

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

‎sample/02-gateways/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"tsconfig-paths": "3.9.0",
5151
"@typescript-eslint/eslint-plugin": "2.12.0",
5252
"@typescript-eslint/parser": "2.12.0",
53-
"eslint": "6.7.2",
53+
"eslint": "6.8.0",
5454
"eslint-config-prettier": "6.7.0",
5555
"eslint-plugin-import": "2.19.1",
5656
"typescript": "3.7.2"

‎sample/03-microservices/package-lock.json‎

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

‎sample/03-microservices/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
"tsconfig-paths": "3.9.0",
4747
"@typescript-eslint/eslint-plugin": "2.12.0",
4848
"@typescript-eslint/parser": "2.12.0",
49-
"eslint": "6.7.2",
49+
"eslint": "6.8.0",
5050
"eslint-config-prettier": "6.7.0",
5151
"eslint-plugin-import": "2.19.1",
5252
"typescript": "3.7.2"

‎sample/04-grpc/package-lock.json‎

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

‎sample/04-grpc/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
"tsconfig-paths": "3.9.0",
4848
"@typescript-eslint/eslint-plugin": "2.12.0",
4949
"@typescript-eslint/parser": "2.12.0",
50-
"eslint": "6.7.2",
50+
"eslint": "6.8.0",
5151
"eslint-config-prettier": "6.7.0",
5252
"eslint-plugin-import": "2.19.1",
5353
"typescript": "3.7.2"

‎sample/05-sql-typeorm/package-lock.json‎

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

0 commit comments

Comments
 (0)