@@ -10,6 +10,8 @@ The minor version will be incremented upon a breaking change and the patch versi
## [Unreleased]
+- create an intentional merge conflict
+
## [0.26.0] - 2022-12-15
### Features
henrye