sjs/mit-license
1
0
Fork 0
mirror of https://github.com/samsonjs/mit-license.git synced 2026-04-27 15:07:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

manually fix merge

Browse source
This commit is contained in:
Remy Sharp 2013-02-08 08:28:46 +00:00
commit 95414606f5
4 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
users/caraya.json
View file

@ -1,5 +1,5 @@
{ {
"copyright": "Carlos Araya", "copyright": "Carlos Araya",
"url": "http://rivendellweb.net/carlos", "url": "http://carlos.rivendellweb.net/",
"theme": "double-windsor" "theme": "double-windsor"
} }

2
users/kkung.json
View file

@ -1 +1 @@
{"copyright":"MinYoung Jung","url":"http:\/\/kkung.net","email":"kkungkkung@gmail.com","theme":"afterdark"} {"copyright":"Minyoung Jeong","url":"http:\/\/kkung.net","email":"kkungkkung@gmail.com","theme":"afterdark"}

2
users/stever.json
View file

@ -1 +1 @@
{"copyright":"Steven Robertson"} {"copyright":"Steven Robertson","url":"http://stever.org.uk","email":"steverobertson@gmail.com"}

6
users/will.json
View file

@ -1 +1,5 @@
{"copyright":"William Mayner","url":"http:\/\/willmayner.com","email":"wmayner@gmail.com","version":"789c82a3"} {
"copyright": "Will Mayner, http://willmayner.com",
"url": "http://willmayner.com",
"theme": "blackwood"
}