Skip to content

Commit

Permalink
chore: resolve conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
kamilmysliwiec committed Aug 24, 2023
2 parents deddb98 + 6ec9d47 commit 6650af0
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 @@ -68,7 +68,7 @@
"@swc/core": "1.3.78",
"@types/inquirer": "9.0.3",
"@types/jest": "29.5.4",
"@types/node": "18.17.8",
"@types/node": "18.17.9",
"@types/node-emoji": "1.8.2",
"@types/shelljs": "0.8.12",
"@types/webpack-node-externals": "3.0.0",
Expand Down

0 comments on commit 6650af0

Please sign in to comment.