Get rid of git merge leftover text

This commit is contained in:
Jonathan 2019-08-05 21:51:05 +02:00 committed by GitHub
parent 458b4a7ee9
commit 8877f8ed91
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