Merge pull request dogecoin#1605 from greenbigfrog/patch-1

Get rid of git merge leftover text
ZongxingXIE · Jul 22, 2020 · f933c83 · f933c83
2 parents 358b273 + 8877f8e
commit f933c83
Showing 1 changed file with 0 additions and 2 deletions.
diff --git 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