From ea72db711ceec361b59c9da6fbf837a647b90d8b Mon Sep 17 00:00:00 2001
From: Oliver Gugger <gugger@gmail.com>
Date: Tue, 19 Nov 2024 21:09:15 +0100
Subject: [PATCH] docs: fix release notes

---
 docs/release-notes/release-notes-0.19.0.md | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/docs/release-notes/release-notes-0.19.0.md b/docs/release-notes/release-notes-0.19.0.md
index 2c73f7aa73..c9e8c38018 100644
--- 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)