From d203741be7c768673cd6d1a9d31bb9a002f3d312 Mon Sep 17 00:00:00 2001 From: HugoPBrito Date: Tue, 9 Dec 2025 17:21:13 +0100 Subject: [PATCH] chore: resolve conflicts --- prowler/CHANGELOG.md | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/prowler/CHANGELOG.md b/prowler/CHANGELOG.md index 7cccb00941..9afd8e3924 100644 --- a/prowler/CHANGELOG.md +++ b/prowler/CHANGELOG.md @@ -2,29 +2,6 @@ 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 -- `cloudstorage_uses_vpc_service_controls` check for GCP provider [(#9256)](https://github.com/prowler-cloud/prowler/pull/9256) -- Alibaba Cloud provider with CIS 2.0 benchmark [(#9329)](https://github.com/prowler-cloud/prowler/pull/9329) -- `repository_immutable_releases_enabled` check for GitHub provider [(#9162)](https://github.com/prowler-cloud/prowler/pull/9162) -- `compute_instance_preemptible_vm_disabled` check for GCP provider [(#9342)](https://github.com/prowler-cloud/prowler/pull/9342) -- `compute_instance_automatic_restart_enabled` check for GCP provider [(#9271)](https://github.com/prowler-cloud/prowler/pull/9271) -- `compute_instance_deletion_protection_enabled` check for GCP provider [(#9358)](https://github.com/prowler-cloud/prowler/pull/9358) - -### Changed -- Update AWS Macie service metadata to new format [(#9265)](https://github.com/prowler-cloud/prowler/pull/9265) -- Update AWS Lightsail service metadata to new format [(#9264)](https://github.com/prowler-cloud/prowler/pull/9264) -- Update AWS GuardDuty service metadata to new format [(#9259)](https://github.com/prowler-cloud/prowler/pull/9259) -- Update AWS Network Firewall service metadata to new format [(#9382)](https://github.com/prowler-cloud/prowler/pull/9382) -- Update AWS MQ service metadata to new format [(#9267)](https://github.com/prowler-cloud/prowler/pull/9267) -- Update AWS Macie service metadata to new format [(#9265)](https://github.com/prowler-cloud/prowler/pull/9265) -- Update AWS Lightsail service metadata to new format [(#9264)](https://github.com/prowler-cloud/prowler/pull/9264) - ---- ## [v5.14.3] (Prowler UNRELEASED) @@ -34,7 +11,6 @@ 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)