Fix contributors merge conflict

This commit is contained in:
Peter Boyer 2016-11-05 13:58:08 -04:00
commit b444d51648
1 changed files with 2 additions and 1 deletions

View File

@ -97,4 +97,5 @@ YYYY/MM/DD, github id, Full name, email
2016/08/11, BurtHarris, Ralph "Burt" Harris, Burt_Harris_antlr4@azxs.33mail.com
2016/08/19, andjo403, Andreas Jonson, andjo403@hotmail.com
2016/10/13, cgudrian, Christian Gudrian, christian.gudrian@gmx.de
2016/10/13, nielsbasjes, Niels Basjes, niels@basjes.nl
2016/10/13, nielsbasjes, Niels Basjes, niels@basjes.nl
2016/11/05, runner-mei, meifakun, runner.mei@gmail.com