From 81cd1f9eced89b564f0de06df4a64b7ce189caf7 Mon Sep 17 00:00:00 2001
From: ayyoob <ayyoobhamza@gmail.com>
Date: Sun, 26 Jul 2015 02:18:32 +0530
Subject: [PATCH] user api conflict resolved

---
 .../src/repository/jaggeryapps/iotserver/api/user-api.jag   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/api/user-api.jag b/modules/distribution/src/repository/jaggeryapps/iotserver/api/user-api.jag
index 0837370f..eacea91d 100644
--- a/modules/distribution/src/repository/jaggeryapps/iotserver/api/user-api.jag
+++ b/modules/distribution/src/repository/jaggeryapps/iotserver/api/user-api.jag
@@ -78,9 +78,9 @@ if (uriMatcher.match("/{context}/api/user/login/")) {
 	} else {
 		userRoles = String(addUserFormData.userRoles).split(",");
 	}
-	userRoles=["deviceRole, deviceUser"];
-	//TODO-Apply new users,
-	userRoles = [];
+
+	userRoles="deviceRole,deviceUser".split(",");
+
 	try {
 		result = userModule.registerUser(username, firstname, lastname, emailAddress, password,
 				userRoles);