This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.5.x-fixes by this push:
new c385234e9a Fix codeql-analysis Github workflow (post merge conflicts
resolution)
c385234e9a is described below
commit c385234e9ad8f51bca0bf32ae9a2e4305d560c7e
Author: Andriy Redko <[email protected]>
AuthorDate: Thu Jan 2 10:27:10 2025 -0500
Fix codeql-analysis Github workflow (post merge conflicts resolution)
---
.github/workflows/codeql-analysis.yml | 4 ----
1 file changed, 4 deletions(-)
diff --git a/.github/workflows/codeql-analysis.yml
b/.github/workflows/codeql-analysis.yml
index 13366b61af..23921523a5 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -82,8 +82,4 @@ jobs:
# make release
- name: Perform CodeQL Analysis
-<<<<<<< HEAD
- uses:
github/codeql-action/analyze@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6
-=======
uses:
github/codeql-action/analyze@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
->>>>>>> 47bbbcd630 (Bump github/codeql-action from 3.27.9 to 3.28.0 (#2205))
