From 08ee5c9a4354fef315b318c50f50bf0935a9e937 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9sar=20Arroba?=
 <19954079+cesararroba@users.noreply.github.com>
Date: Fri, 31 Oct 2025 11:43:29 +0100
Subject: [PATCH] chore: fix conflicts (#9121)

---
 .github/workflows/ui-codeql.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.github/workflows/ui-codeql.yml b/.github/workflows/ui-codeql.yml
index 5a502a28fb..ec71d8cb4a 100644
--- a/.github/workflows/ui-codeql.yml
+++ b/.github/workflows/ui-codeql.yml
@@ -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