ben.carrasco/prowler
1
0
Fork 0
mirror of https://github.com/prowler-cloud/prowler.git synced 2026-07-24 04:51:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
HugoPBrito
2025-12-09 17:18:53 +01:00
parent 52e26252e0
commit 975e6b739c
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
prowler/CHANGELOG.md
-4
View File
@@ -2,9 +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
@@ -34,7 +31,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)