fix merge conflict artifact that was left in

src/user/data.js

@@ -64,7 +64,8 @@ module.exports = function (User) {
 			addField('lastonline');
 		}
 
-<<<<<<< HEAD
+		async.waterfall([
+			function (next) {
 				db.getObjectsFields(keys, fields, function (err, users) {
 					if (err) {
 						return callback(err);
@@ -74,18 +75,13 @@ module.exports = function (User) {
 						return users[ref[uid]];
 					});
 
-			modifyUserData(users, fieldsToRemove, callback);
+					next(null, users);
 				});
-=======
-		async.waterfall([
-			function (next) {
-				db.getObjectsFields(keys, fields, next);
 			},
 			function (users, next) {
 				modifyUserData(users, fieldsToRemove, next);
 			},
 		], callback);
->>>>>>> master
 	};
 
 	User.getMultipleUserFields = function (uids, fields, callback) {
@@ -117,7 +113,8 @@ module.exports = function (User) {
 			return 'user:' + uid;
 		});
 
-<<<<<<< HEAD
+		async.waterfall([
+			function (next) {
 				db.getObjects(keys, function (err, users) {
 					if (err) {
 						return callback(err);
@@ -127,18 +124,13 @@ module.exports = function (User) {
 						return users[ref[uid]];
 					});
 
-			modifyUserData(users, [], callback);
+					next(null, users);
 				});
-=======
-		async.waterfall([
-			function (next) {
-				db.getObjects(keys, next);
 			},
 			function (users, next) {
 				modifyUserData(users, [], next);
 			},
 		], callback);
->>>>>>> master
 	};
 
 	function modifyUserData(users, fieldsToRemove, callback) {