change user api

modules/distribution/src/repository/jaggeryapps/iot/api/user-api.jag

@@ -59,18 +59,10 @@ if (uriMatcher.match("/{context}/api/user/login/")) {
 	emailAddress = addUserFormData.emailAddress;
 	password =  addUserFormData.password;
 
+	//enable internal subscriptions for APIM
+	userRoleStr = "Internal/subscriber,Internal/everyone" ;
+	userRoles = String(userRoleStr).split(",");
 
-<<<<<<< HEAD
-=======
-		//enable internal subscriptions for APIM
-       	userRoleStr = "Internal/subscriber,Internal/everyone" ;
-
-		userRoles = String(userRoleStr).split(",");
-
-
-
-
->>>>>>> f1bc4007d286384b865705772c640b09b10607d7
 	try {
 		result = userModule.registerUser(username, firstname, lastname, emailAddress, password,
 				userRoles);