Resolving merge conflicts

2025-02-04 08:47:46 -03:00
parent 5fb9a0b6b1 b29bd6b936
commit e4f782f55d
12 changed files with 298 additions and 39 deletions
@@ -1,6 +1,24 @@
 # Change Log
 All notable changes to this project will be documented in this file.

+## [4.11.0]
+
+### Added
+
+- None
+
+### Changed
+
+- None
+
+### Fixed
+
+- Change the cleaning disk step ([#1663](https://github.com/wazuh/wazuh-docker/pull/1663))
+
+### Deleted
+
+- None
+
 ## [4.10.2]

 ### Added