Remove merge conflict symbols from changelog (#1454)

AgnostiqHQ · Dec 15, 2022 · a0c123a · a0c123a
1 parent d678d85
commit a0c123a
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [UNRELEASED]
 
+### Fixed
+
+- Removed merge conflict symbols in changelog
+
 ## [0.209.0-rc.0] - 2022-12-15
 
 ### Authors
@@ -112,7 +116,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added an executors-and-UI graphic.
 - Adding `Deployment` section for self-hosting guide
 
->>>>>>> develop
 
 ## [0.208.0-rc.0] - 2022-11-05