diff options
author | Timothy J Fontaine <tjfontaine@gmail.com> | 2014-02-17 20:57:53 -0800 |
---|---|---|
committer | Timothy J Fontaine <tjfontaine@gmail.com> | 2014-02-17 20:57:53 -0800 |
commit | 466a9b5c78abef8f6c5261f33df83672d78b41b5 (patch) | |
tree | 3acb06281dbb1bf16afe77b975db5426e346094c /deps/npm/test/tap/shrinkwrap-dev-dependency/package.json | |
parent | e5eadcfa199298d6b6f14df43cfcdd5b478c6208 (diff) | |
parent | 562b015170c4c0bf442d49d46332fb3918173306 (diff) | |
download | node-466a9b5c78abef8f6c5261f33df83672d78b41b5.tar.gz |
Merge remote-tracking branch 'upstream/v0.10'
Conflicts:
src/node_zlib.cc
Diffstat (limited to 'deps/npm/test/tap/shrinkwrap-dev-dependency/package.json')
-rw-r--r-- | deps/npm/test/tap/shrinkwrap-dev-dependency/package.json | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/deps/npm/test/tap/shrinkwrap-dev-dependency/package.json b/deps/npm/test/tap/shrinkwrap-dev-dependency/package.json new file mode 100644 index 000000000..e325a4731 --- /dev/null +++ b/deps/npm/test/tap/shrinkwrap-dev-dependency/package.json @@ -0,0 +1,12 @@ +{ + "author": "Domenic Denicola", + "name": "npm-test-shrinkwrap-dev-dependency", + "version": "0.0.0", + "dependencies": { + "request": "0.9.0", + "underscore": "1.3.1" + }, + "devDependencies": { + "underscore": "1.5.1" + } +} |