 				body: [rooms: rooms]
 		catch e
 			return RocketChat.API.v1.failure e.name + ': ' + e.message
-<<<<<<< HEAD
-	
-
-RocketChat.API.v1.addRoute 'admin.addUpdateUser', authRequired: true,
-	post: ->
-	
-		if RocketChat.authz.hasRole(@userId, 'admin') is false
-			return RocketChat.API.v1.unauthorized()
-		
-		try
-			console.log '[routes.coffee] api/v1/admin.addUpdateUser -> request ', _.omit @bodyParams, ['password']
-			if !_.isObject @bodyParams
-				return RocketChat.API.v1.failure()
-					error : 'Request body not encoded as valid JSON'
-			
-			udata = _.pick @bodyParams, [
-					'name'
-					'username'
-					'email'
-					'password'
-					'requiredPasswordChange'
-					'joinDefaultChannels'
-					'verified'
-					'sendWelcomeEmail'
-				]
-			_.defaults udata, {
-				'name': '', 
-				'username': '',
-				'email': '',
-				'password': '',
-				'requiredPasswordChange': true,
-				'joinDefaultChannels': true,
-				'verified': false,
-				'sendWelcomeEmail': true,
-			}
-				
-			Meteor.runAsUser this.userId, () =>
-				Meteor.call 'insertOrUpdateUser', udata
-			return RocketChat.API.v1.success
-				user: RocketChat.models.Users.findOneByUsername udata.username
-				 
-		catch e
-			console.log '[routes.coffee] api/v1/admin.addUpdateUser Error: ', e.message, e.stack
-			return RocketChat.API.v1.failure e.name + ': ' + e.message
+
 			
 ###
 can take these as args to update.

		

### Remove outgoing webhook
Delete an integration, user must also have manage-integrations permissions
###			
RocketChat.API.v1.addRoute 'integrations.outgoingWebhook.delete', authRequired: true,
	post: ->

			
			
### Create Private Group
Request example:
  {"name":"room5","members":["Jeff","Larry","Stephen"]}
###
RocketChat.API.v1.addRoute 'groups.create', authRequired: true,
