From 8877f8ed912b43fce29b48d5b7df3c099f52500a Mon Sep 17 00:00:00 2001
From: Jonathan <greenbigfrog@gmail.com>
Date: Mon, 5 Aug 2019 21:51:05 +0200
Subject: [PATCH] Get rid of git merge leftover text

---
 doc/release-notes.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/doc/release-notes.md b/doc/release-notes.md
index 807e978ec..b0a654158 100644
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -447,8 +447,6 @@ Thanks to everyone who directly contributed to this release:
 - Gregory Sanders
 - Jonas Schnelli
 - Matt Corallo
-<<<<<<< HEAD
-=======
 - Matthew King
 - matthias
 - Max Keller