Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
iarna committed Jul 24, 2015
1 parent f4e22e5 commit 6b3f6d9
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 3 deletions.
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ npm-debug.log
/node_modules/cli-width/
/node_modules/d/
/node_modules/debug-log/
/node_modules/deglob
/node_modules/disparity/
/node_modules/doctrine/
/node_modules/es5-ext/
Expand All @@ -142,6 +143,7 @@ npm-debug.log
/node_modules/esformatter-semicolon-first/
/node_modules/esformatter-spaced-lined-comment/
/node_modules/esformatter/
/node_modules/esformatter-jsx/
/node_modules/eslint-config-standard-react/
/node_modules/eslint-config-standard/
/node_modules/eslint-plugin-react/
Expand All @@ -150,15 +152,19 @@ npm-debug.log
/node_modules/esrecurse/
/node_modules/estraverse-fb/
/node_modules/event-emitter/
/node_modules/falafel-espree
/node_modules/figures/
/node_modules/find-root/
/node_modules/get-stdin/
/node_modules/globals/
/node_modules/ignore/
/node_modules/inquirer/
/node_modules/js-beautify/
/node_modules/mout/
/node_modules/npm-path/
/node_modules/npm-run/
/node_modules/object-assign/
/node_modules/path/
/node_modules/pkg-config/
/node_modules/protochain/
/node_modules/readline2/
Expand All @@ -171,6 +177,7 @@ npm-debug.log
/node_modules/run-parallel/
/node_modules/rx/
/node_modules/serializerr/
/node_modules/standard/
/node_modules/standard-format/
/node_modules/stdin/
/node_modules/string.prototype.endswith/
Expand Down
4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -167,14 +167,16 @@
],
"devDependencies": {
"deep-equal": "~1.0.0",
"eslint": "~0.24.1",
"estraverse": "~4.1.0",
"marked": "~0.3.3",
"marked-man": "~0.1.5",
"nock": "~2.7.0",
"npm-registry-couchapp": "~2.6.11",
"npm-registry-mock": "~1.0.0",
"require-inject": "~1.2.0",
"sprintf-js": "~1.0.2",
"standard": "~4.3.2",
"standard": "~4.5.4",
"tap": "~1.3.1"
},
"scripts": {
Expand Down
4 changes: 2 additions & 2 deletions test/tap/optional-metadep-rollback-collision.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ var d2 = {
}
}

var opdep = {
var opdep_json = {
name: 'opdep',
version: '1.0.0',
description: 'To explode, of course!',
Expand Down Expand Up @@ -178,7 +178,7 @@ test('setup', function (t) {
mkdirp.sync(path.join(deps, 'opdep'))
fs.writeFileSync(
path.join(deps, 'opdep', 'package.json'),
JSON.stringify(opdep, null, 2)
JSON.stringify(opdep_json, null, 2)
)
fs.writeFileSync(path.join(deps, 'opdep', 'bad-server.js'), badServer)

Expand Down

0 comments on commit 6b3f6d9

Please sign in to comment.