Update CHANGELOG.md

gramaziokohler · Sep 11, 2024 · 9f687a8 · 9f687a8
1 parent e82f3a8
commit 9f687a8
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,13 +10,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 ### Changed
-<<<<<<< 46-update-examples
-
 * Updated examples & documentation
-=======
 * Fixed domain init in DataInt
 * Changed output options in Plot components.
->>>>>>> main
 * Fixed Windows install script trying to install from offline wheels.
 * Fixed issues related to using ARA on Mac.