diff options
author | silverwind <me@silverwind.io> | 2016-04-09 14:11:01 +0200 |
---|---|---|
committer | silverwind <me@silverwind.io> | 2016-04-10 11:46:08 +0200 |
commit | 2f6ff1bb64ac4f3e201039c8e83f8eb95f73c769 (patch) | |
tree | 710fe0778ca523281965244fdca60c4a031980e6 /tools/eslint/node_modules/lodash/zipObjectDeep.js | |
parent | 8f4fdc93f07a06a62d4f867c6e0fd2f6287bb8be (diff) | |
download | node-new-2f6ff1bb64ac4f3e201039c8e83f8eb95f73c769.tar.gz |
tools: update ESLint to 2.7.0
PR-URL: https://github.com/nodejs/node/pull/6132
Reviewed-By: Brian White <mscdex@mscdex.net>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: thefourtheye <thechargingvolcano@gmail.com>
Diffstat (limited to 'tools/eslint/node_modules/lodash/zipObjectDeep.js')
-rw-r--r-- | tools/eslint/node_modules/lodash/zipObjectDeep.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/eslint/node_modules/lodash/zipObjectDeep.js b/tools/eslint/node_modules/lodash/zipObjectDeep.js index 09eb541c53..7c858f844f 100644 --- a/tools/eslint/node_modules/lodash/zipObjectDeep.js +++ b/tools/eslint/node_modules/lodash/zipObjectDeep.js @@ -6,8 +6,9 @@ var baseSet = require('./_baseSet'), * * @static * @memberOf _ + * @since 4.1.0 * @category Array - * @param {Array} [props=[]] The property names. + * @param {Array} [props=[]] The property identifiers. * @param {Array} [values=[]] The property values. * @returns {Object} Returns the new object. * @example |