From 623aab7bc772e625ae5abf9d3faf500b622902b7 Mon Sep 17 00:00:00 2001 From: vdaas-ci <57942646+vdaas-ci@users.noreply.github.com> Date: Fri, 13 Sep 2024 10:37:37 +0900 Subject: [PATCH] [create-pull-request] automated change (#2623) Signed-off-by: vdaas-ci --- versions/actions/GITHUB_CODEQL_ACTION_ANALYZE | 4 ++++ versions/actions/GITHUB_CODEQL_ACTION_AUTOBUILD | 4 ++++ versions/actions/GITHUB_CODEQL_ACTION_INIT | 4 ++++ versions/actions/GITHUB_CODEQL_ACTION_UPLOAD_SARIF | 4 ++++ versions/actions/PETER_EVANS_CREATE_PULL_REQUEST | 4 ++++ 5 files changed, 20 insertions(+) diff --git a/versions/actions/GITHUB_CODEQL_ACTION_ANALYZE b/versions/actions/GITHUB_CODEQL_ACTION_ANALYZE index a36e9b0906..2cf355984f 100644 --- a/versions/actions/GITHUB_CODEQL_ACTION_ANALYZE +++ b/versions/actions/GITHUB_CODEQL_ACTION_ANALYZE @@ -1 +1,5 @@ +<<<<<<< HEAD 2.18.1 +======= +2.18.4 +>>>>>>> b63d3de04 ([create-pull-request] automated change (#2623)) diff --git a/versions/actions/GITHUB_CODEQL_ACTION_AUTOBUILD b/versions/actions/GITHUB_CODEQL_ACTION_AUTOBUILD index a36e9b0906..2cf355984f 100644 --- a/versions/actions/GITHUB_CODEQL_ACTION_AUTOBUILD +++ b/versions/actions/GITHUB_CODEQL_ACTION_AUTOBUILD @@ -1 +1,5 @@ +<<<<<<< HEAD 2.18.1 +======= +2.18.4 +>>>>>>> b63d3de04 ([create-pull-request] automated change (#2623)) diff --git a/versions/actions/GITHUB_CODEQL_ACTION_INIT b/versions/actions/GITHUB_CODEQL_ACTION_INIT index a36e9b0906..2cf355984f 100644 --- a/versions/actions/GITHUB_CODEQL_ACTION_INIT +++ b/versions/actions/GITHUB_CODEQL_ACTION_INIT @@ -1 +1,5 @@ +<<<<<<< HEAD 2.18.1 +======= +2.18.4 +>>>>>>> b63d3de04 ([create-pull-request] automated change (#2623)) diff --git a/versions/actions/GITHUB_CODEQL_ACTION_UPLOAD_SARIF b/versions/actions/GITHUB_CODEQL_ACTION_UPLOAD_SARIF index a36e9b0906..2cf355984f 100644 --- a/versions/actions/GITHUB_CODEQL_ACTION_UPLOAD_SARIF +++ b/versions/actions/GITHUB_CODEQL_ACTION_UPLOAD_SARIF @@ -1 +1,5 @@ +<<<<<<< HEAD 2.18.1 +======= +2.18.4 +>>>>>>> b63d3de04 ([create-pull-request] automated change (#2623)) diff --git a/versions/actions/PETER_EVANS_CREATE_PULL_REQUEST b/versions/actions/PETER_EVANS_CREATE_PULL_REQUEST index dfda3e0b4f..9a63f850a5 100644 --- a/versions/actions/PETER_EVANS_CREATE_PULL_REQUEST +++ b/versions/actions/PETER_EVANS_CREATE_PULL_REQUEST @@ -1 +1,5 @@ +<<<<<<< HEAD 6.1.0 +======= +7.0.2 +>>>>>>> b63d3de04 ([create-pull-request] automated change (#2623))