merge package.json conflict

This commit is contained in:
David Dias
2015-09-15 17:16:09 +01:00
2 changed files with 8 additions and 3 deletions

View File

@ -1,6 +1,6 @@
language: node_js language: node_js
node_js: node_js:
- "iojs" - "4.0"
branches: branches:
only: only:

View File

@ -6,7 +6,9 @@
"scripts": { "scripts": {
"test": "./node_modules/.bin/lab tests/*-test.js", "test": "./node_modules/.bin/lab tests/*-test.js",
"coverage": "./node_modules/.bin/lab -t 100 tests/*-test.js", "coverage": "./node_modules/.bin/lab -t 100 tests/*-test.js",
"codestyle": "./node_modules/.bin/standard --format" "codestyle": "./node_modules/.bin/standard --format",
"lint": "jshint .",
"validate": "npm ls"
}, },
"keywords": [ "keywords": [
"IPFS" "IPFS"
@ -17,6 +19,9 @@
"codestyle", "codestyle",
"test" "test"
], ],
"engines": {
"node": "^4.0.0"
},
"bugs": { "bugs": {
"url": "https://github.com/diasdavid/node-peer-id/issues" "url": "https://github.com/diasdavid/node-peer-id/issues"
}, },
@ -31,4 +36,4 @@
"bs58": "^2.0.1", "bs58": "^2.0.1",
"multihashing": "^0.1.3" "multihashing": "^0.1.3"
} }
} }