Conflicts resolution

2025-06-19 12:28:14 -03:00
parent 31101be6d2 4fcca62c3d
commit f43faae24b
32 changed files with 841 additions and 601 deletions
@@ -1,10 +1,46 @@
 # Change Log
 All notable changes to this project will be documented in this file.

+## [6.0.0]
+
+### Added
+
+- none
+
+### Changed
+
+- None
+
+### Fixed
+
+- None
+
+### Deleted
+
+- None
+
 ## [5.0.0]

 ### Added

+- none
+
+### Changed
+
+- None
+
+### Fixed
+
+- None
+
+### Deleted
+
+- None
+
+## [4.10.2]
+
+### Added
+
 - None

 ### Changed