Skip to content

Commit

Permalink
Resolve merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
Henry Mercer committed Aug 19, 2022
1 parent 3af72a7 commit fbab93d
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 12 deletions.
6 changes: 0 additions & 6 deletions package-lock.json
View file

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

6 changes: 0 additions & 6 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,7 @@
"@types/adm-zip": "^0.5.0",
"@types/get-folder-size": "^2.0.0",
"@types/js-yaml": "^4.0.5",
<<<<<<< HEAD
"@types/long": "4.0.1",
"@types/node": "12.12",
=======
"@types/long": "5.0.0",
"@types/node": "16.11.22",
>>>>>>> origin/releases/v2
"@types/semver": "^7.3.8",
"@types/sinon": "^10.0.2",
"@typescript-eslint/parser": "^5.0.0",
Expand Down

0 comments on commit fbab93d

Please sign in to comment.