fix conflicts, fix name

This commit is contained in:
hackiftekhar committed 2014-11-30 12:45:29 +05:30
commit b84309d1b3
538 files changed
+16099 -98

No files matched your search

+1 -1
View File
@@ -12,7 +12,7 @@
"name": "Mayur",
"twitter": "",
"koding": "mayur43s",
"location": "Indore, IN",
"location": "Indore, IN"
},
{
"name": "Shrejas",