fix conflicts

alphaville · Oct 14, 2024 · 4a97cad · 4a97cad
1 parent bb78734
commit 4a97cad
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/open-codegen/CHANGELOG.md b/open-codegen/CHANGELOG.md
@@ -213,13 +213,11 @@ Note: This is the Changelog file of `opengen` - the Python interface of OpEn
 * Project-specific `tcp_iface` TCP interface
 * Fixed `lbfgs` typo
 
-<<<<<<< HEAD
-[0.8.1]: https://github.com/alphaville/optimization-engine/compare/opengen-0.8.0...opengen-0.8.1
-=======
+
+[0.9.1]: https://github.com/alphaville/optimization-engine/compare/opengen-0.9.0...opengen-0.9.1
 [0.9.0]: https://github.com/alphaville/optimization-engine/compare/opengen-0.8.1...opengen-0.9.0
 [0.8.1]: https://github.com/alphaville/optimization-engine/compare/v0.9.0...opengen-0.8.1
 [0.8.1]: https://github.com/alphaville/optimization-engine/compare/v0.9.0...opengen-0.8.1
->>>>>>> master
 [0.8.0]: https://github.com/alphaville/optimization-engine/compare/opengen-0.7.1...opengen-0.8.0
 [0.7.1]: https://github.com/alphaville/optimization-engine/compare/opengen-0.7.0...opengen-0.7.1
 [0.7.0]: https://github.com/alphaville/optimization-engine/compare/opengen-0.6.13...opengen-0.7.0