docs: fix release notes

guggero · guggero · commit ea72db711cee · 2024-11-19T21:09:15.000+01:00
diff --git a/docs/release-notes/release-notes-0.19.0.md b/docs/release-notes/release-notes-0.19.0.md
@@ -202,10 +202,5 @@ The underlying functionality between those two options remain the same.
 * Oliver Gugger
 * Pins
 * Viktor Tigerström
-<<<<<<< HEAD
 * Yong Yu
 * Ziggie
-
-=======
-* Ziggie
->>>>>>> 5a6264b6a (docs: update release notes)
