fix conflicts, fix name

2014-11-30 12:48:06 +05:30
parent b84309d1b3
commit 3112bc7419
1 changed files with 1 additions and 1 deletions
@@ -18,7 +18,7 @@
      "name": "Shrejas",
      "twitter": "",
      "koding": "Shrejas",
-      "location": "Indore, IN",
+      "location": "Indore, IN"
    }
  ]
 }