From d4428860fd74c2f1472edb549c980e44286dcc18 Mon Sep 17 00:00:00 2001 From: HugoPBrito Date: Tue, 9 Dec 2025 17:20:21 +0100 Subject: [PATCH] Revert "chore: resolve conflicts" This reverts commit 975e6b739c53fe701d3f3d506701f4c8b89aa685. --- prowler/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/prowler/CHANGELOG.md b/prowler/CHANGELOG.md index 44bae5b0a8..7cccb00941 100644 --- a/prowler/CHANGELOG.md +++ b/prowler/CHANGELOG.md @@ -2,6 +2,9 @@ All notable changes to the **Prowler SDK** are documented in this file. +<<<<<<< HEAD +## [v5.14.2] (Prowler v5.14.2) +======= ## [v5.15.0] (Prowler UNRELEASED) ### Added @@ -31,6 +34,7 @@ All notable changes to the **Prowler SDK** are documented in this file. --- ## [v5.14.2] (Prowler 5.14.2) +>>>>>>> 01fe379b5 (fix: remove incorrect `threat-detection` category from checks (#9489)) ### Fixed - Custom check folder metadata validation [(#9335)](https://github.com/prowler-cloud/prowler/pull/9335)