github/codeql-action
0
0
Fork 0
mirror of https://github.com/github/codeql-action.git synced 2026-05-08 23:00:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resolve merge conflicts

Browse Source
This commit is contained in:
Henry Mercer
2022-08-19 11:04:36 +01:00
parent 3af72a73e6
commit fbab93d8c8
2 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package.json
-6
View File
@@ -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",