From b606a614fe155b796df3b48e83b2248ba8774a85 Mon Sep 17 00:00:00 2001
From: Josema Camacho <josema@prowler.com>
Date: Tue, 12 May 2026 11:51:35 +0200
Subject: [PATCH] Merging v5.26 into backport/v5.26/pr-11001

---
 api/CHANGELOG.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/api/CHANGELOG.md b/api/CHANGELOG.md
index 9d093d2553..a2103d8a21 100644
--- a/api/CHANGELOG.md
+++ b/api/CHANGELOG.md
@@ -2,8 +2,6 @@
 
 All notable changes to the **Prowler API** are documented in this file.
 
-<<<<<<< HEAD
-=======
 ## [1.27.1] (Prowler v5.26.1)
 
 ### 🚀 Added
@@ -20,7 +18,6 @@ All notable changes to the **Prowler API** are documented in this file.
 
 ---
 
->>>>>>> 6dfa13575 (perf(api): add multi-column GIN index on findings array fields (#11001))
 ## [1.27.0] (Prowler v5.26.0)
 
 ### 🚀 Added