chore: fix conflicts (#9121)

2026-07-24 04:51:51 +00:00 · 2025-10-31 11:43:29 +01:00
parent 4a35b21367
commit 08ee5c9a43
1 changed files with 0 additions and 5 deletions
@@ -28,14 +28,9 @@ on:
    - cron: "00 12 * * *"

 jobs:
-<<<<<<< HEAD
-  analyze:
-    name: Analyze
-=======
  ui-analyze:
    if: github.repository == 'prowler-cloud/prowler'
    name: CodeQL Security Analysis
->>>>>>> aaae73cd1 (chore(github): rename jobs to know which component they belong (#9117))
    runs-on: ubuntu-latest
    permissions:
      actions: read