mirror of
https://github.com/actions/setup-java.git
synced 2025-08-19 11:21:02 +00:00
resolve conflicts
This commit is contained in:
parent
684674ed26
commit
baaaebd250
2 changed files with 901 additions and 581 deletions
1474
package-lock.json
generated
1474
package-lock.json
generated
File diff suppressed because it is too large
Load diff
|
@ -40,12 +40,12 @@
|
|||
"@types/jest": "^29.5.14",
|
||||
"@types/node": "^20.11.24",
|
||||
"@types/semver": "^7.5.8",
|
||||
"@typescript-eslint/eslint-plugin": "^5.54.0",
|
||||
"@typescript-eslint/parser": "^5.54.0",
|
||||
"@typescript-eslint/eslint-plugin": "^8.35.1",
|
||||
"@typescript-eslint/parser": "^8.35.1",
|
||||
"@vercel/ncc": "^0.38.1",
|
||||
"eslint": "^8.57.0",
|
||||
"eslint-config-prettier": "^8.6.0",
|
||||
"eslint-plugin-jest": "^27.9.0",
|
||||
"eslint-plugin-jest": "^29.0.1",
|
||||
"eslint-plugin-node": "^11.1.0",
|
||||
"jest": "^29.7.0",
|
||||
"jest-circus": "^29.7.0",
|
||||
|
@ -57,4 +57,4 @@
|
|||
"url": "https://github.com/actions/setup-java/issues"
|
||||
},
|
||||
"homepage": "https://github.com/actions/setup-java#readme"
|
||||
}
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue