fixed merge conflict

This commit is contained in:
Remy Sharp 2011-10-16 17:53:46 +01:00
commit 9c88ca8129

View file

@ -2,5 +2,7 @@
"rem": "Remy Sharp, http://remysharp.com",
"leftlogic": "Left Logic Ltd, http://leftlogic.com",
"mathias": "Mathias Bynens, http://mathiasbynens.be/",
"passcod": "Félix Saparelli, http://passcod.net"
"passcod": "Félix Saparelli, http://passcod.net",
"aaron": "Aaron Bassett, http://aaronbassett.com",
"levelup": "Level Up (Scotland) Limited, http://www.thisislevelup.com"
}