mirror of
https://github.com/samsonjs/mit-license.git
synced 2026-04-24 14:37:46 +00:00
fixed merge conflict
This commit is contained in:
commit
9c88ca8129
1 changed files with 3 additions and 1 deletions
|
|
@ -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"
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue