docs: fix release notes

ellemouton · Nov 19, 2024 · ea72db7 · ea72db7
1 parent ab3b3c8
commit ea72db7
Showing 1 changed file with 0 additions and 5 deletions.
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)