Merge pull request #1605 from greenbigfrog/patch-1

Get rid of git merge leftover text
This commit is contained in:
Max K 2020-07-22 20:07:31 +02:00 committed by GitHub
commit f933c83b75
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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