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

Resolve conflicts in action.yml files

Browse Source
This commit is contained in:
Michael B. Gale
2026-05-15 13:21:17 +01:00
parent 4b79f1ba10
commit 70a1165f9a
7 changed files with 0 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
start-proxy/action.yml
-6
View File
@@ -29,12 +29,6 @@ outputs:
proxy_urls:
description: A stringified JSON array of objects containing the types and URLs of the configured registries.
runs:
<<<<<<< HEAD
using: node20
main: "../lib/start-proxy-action.js"
post: "../lib/start-proxy-action-post.js"
=======
using: node24
main: "../lib/start-proxy-entry.js"
post: "../lib/start-proxy-post-entry.js"
>>>>>>> origin/releases/v4