Merge #302

302: Changelog: fix merge diff leftovers r=richardeoin a=mattico Co-authored-by: Matt Ickstadt <mattico8@gmail.com>
stm32-rs · Dec 27, 2021 · 80f8676 · 80f8676
2 parents 6646a21 + 4afe87e
commit 80f8676
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -210,7 +210,4 @@
 [284]: https://github.com/stm32-rs/stm32h7xx-hal/pull/284
 [287]: https://github.com/stm32-rs/stm32h7xx-hal/pull/287
 [292]: https://github.com/stm32-rs/stm32h7xx-hal/pull/292
-<<<<<<< HEAD
-=======
 [297]: https://github.com/stm32-rs/stm32h7xx-hal/pull/297
->>>>>>> 566dfc4... Update CHANGELOG