Remove merge conflict marker

therealprof · therealprof · commit 8970b06de246 · 2021-04-25T23:11:08.000+02:00
Signed-off-by: Daniel Egger &lt;daniel@eggers-club.de&gt;
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,7 +7,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
-=======
 ### Changed
 
 - Updated stm32f0 dependency to v0.13 (breaking change)
