From 3112bc741974890d7b49a7d1432f45428c140e12 Mon Sep 17 00:00:00 2001
From: hackiftekhar <hack.iftekhar@gmail.com>
Date: Sun, 30 Nov 2014 12:48:06 +0530
Subject: [PATCH] fix conflicts, fix name

---
 Teams/IQHacker/team.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Teams/IQHacker/team.json b/Teams/IQHacker/team.json
index 593c902..cbb9cac 100644
--- a/Teams/IQHacker/team.json
+++ b/Teams/IQHacker/team.json
@@ -18,7 +18,7 @@
       "name": "Shrejas",
       "twitter": "",
       "koding": "Shrejas",
-      "location": "Indore, IN",
+      "location": "Indore, IN"
     }
   ]
 }