Resolve conflict
commit
89ff41e389
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -26,8 +26,8 @@
|
||||||
"packageManager": "yarn@3.6.3",
|
"packageManager": "yarn@3.6.3",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@actions/core": "^1.11.1",
|
"@actions/core": "^1.11.1",
|
||||||
"@aws-sdk/client-ecr": "^3.858.0",
|
"@aws-sdk/client-ecr": "^3.859.0",
|
||||||
"@aws-sdk/client-ecr-public": "^3.858.0",
|
"@aws-sdk/client-ecr-public": "^3.859.0",
|
||||||
"@docker/actions-toolkit": "^0.62.1",
|
"@docker/actions-toolkit": "^0.62.1",
|
||||||
"http-proxy-agent": "^7.0.2",
|
"http-proxy-agent": "^7.0.2",
|
||||||
"https-proxy-agent": "^7.0.6"
|
"https-proxy-agent": "^7.0.6"
|
||||||
|
@ -47,4 +47,4 @@
|
||||||
"ts-node": "^10.9.2",
|
"ts-node": "^10.9.2",
|
||||||
"typescript": "^5.4.5"
|
"typescript": "^5.4.5"
|
||||||
}
|
}
|
||||||
}
|
}
|
Loading…
Reference in New Issue