Merge pull request #548 from hackiftekhar/master

Fix conflicts, fix name
This commit is contained in:
Nitin Gupta
2014-11-29 23:21:56 -08:00
+2 -2
View File
@@ -15,9 +15,9 @@
"location": "Indore, IN" "location": "Indore, IN"
}, },
{ {
"name": "Mayur", "name": "Shrejas",
"twitter": "", "twitter": "",
"koding": "mayur43s", "koding": "Shrejas",
"location": "Indore, IN" "location": "Indore, IN"
} }
] ]