Resolving conflicts

2026-02-06 22:21:11 +07:00
parent 21e9cb178c 2e62b840c4
commit 40d7e24b19
22 changed files with 197 additions and 60 deletions
@@ -1,6 +1,24 @@
 # Change Log
 All notable changes to this project will be documented in this file.

+## [4.14.4]
+
+### Added
+
+- None
+
+### Changed
+
+- Backport from 5.0.0: Backport from 5.0.0: Allow building separate targets #2177 ([#2184](https://github.com/wazuh/wazuh-docker/pull/2184))
+
+### Fixed
+
+- None
+
+### Deleted
+
+- None
+
 ## [4.14.3]

 ### Added