sjs/mit-license
1
0
Fork 0
mirror of https://github.com/samsonjs/mit-license.git synced 2026-06-29 05:39:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed merge conflict

Browse source
This commit is contained in:
Remy Sharp 2012-10-29 10:23:17 +00:00
commit f518c7363f
4 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
users/abhshkdz.json
View file

@ -1 +1,5 @@
{"copyright":"Abhishek Das","email":"das.abhshk@gmail.com","format":"txt"}
{
"copyright": "Abhishek Das",
"url": "https:\/\/github.com/abhshkdz",
"email": "das.abhshk@gmail.com"
}

4
users/neutroncreations.json Normal file
View file

@ -0,0 +1,4 @@
{
"copyright": "Neutron Creations, http://neutroncreations.com",
"url": "http://neutroncreations.com"
}

2
users/ptersen.json
View file

@ -1 +1 @@
{"copyright":"Brian Petersen","url":"http:\/\/brian.ptersen.info\/","format":"html"}
{"copyright":"Brian Petersen","url":"http:\/\/brian.ptersen.io\/","format":"html"}

5
users/yogesh.json Normal file
View file

@ -0,0 +1,5 @@
{
"copyright": "Yogesh Chaudhari, http://www.cyogesh.com",
"url": "http://www.cyogesh.com",
"email": "mr.yogesh@gmail.com"
}