Skip to content

Commit

Permalink
chore(): resolve conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
kamilmysliwiec committed Jan 12, 2022
2 parents 023c855 + f187f91 commit 9fd0232
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
14 changes: 7 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"tsconfig-paths": "3.12.0",
"tsconfig-paths-webpack-plugin": "3.5.2",
"typescript": "4.5.4",
"webpack": "5.65.0",
"webpack": "5.66.0",
"webpack-node-externals": "3.0.0"
},
"devDependencies": {
Expand Down

0 comments on commit 9fd0232

Please sign in to comment.