diff options
| author | Frankie <frankie.pangilinan@consensys.net> | 2016-06-22 06:04:00 +0800 |
|---|---|---|
| committer | Frankie <frankie.pangilinan@consensys.net> | 2016-06-22 06:04:00 +0800 |
| commit | cf663f1104697440121d32cc6db2a8a1d5d54c5a (patch) | |
| tree | 3ed4b8b9fe8c85f3b3a5bf68482c3fb9967f2de5 /package.json | |
| parent | 265725c6edd62a7f46a9b9cf5a443cf01f0ff00c (diff) | |
| parent | dc2ef967028723afe9fe1efd669754723e38a4f0 (diff) | |
| download | tangerine-wallet-browser-cf663f1104697440121d32cc6db2a8a1d5d54c5a.tar.gz tangerine-wallet-browser-cf663f1104697440121d32cc6db2a8a1d5d54c5a.tar.zst tangerine-wallet-browser-cf663f1104697440121d32cc6db2a8a1d5d54c5a.zip | |
Fix conflict
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/package.json b/package.json index a82738c67..31ae0db95 100644 --- a/package.json +++ b/package.json @@ -36,6 +36,7 @@ "eth-store": "^1.1.0", "ethereumjs-tx": "^1.0.0", "ethereumjs-util": "^4.4.0", + "gulp-eslint": "^2.0.0", "hat": "0.0.3", "identicon.js": "^1.2.1", "inject-css": "^0.1.1", @@ -68,6 +69,7 @@ "xtend": "^4.0.1" }, "devDependencies": { + "babel-eslint": "^6.0.5", "babel-preset-es2015": "^6.6.0", "babel-register": "^6.7.2", "babelify": "^7.2.0", @@ -87,6 +89,7 @@ "jshint-stylish": "~0.1.5", "lodash.assign": "^4.0.6", "mocha": "^2.4.5", + "mocha-eslint": "^2.1.1", "mocha-jsdom": "^1.1.0", "mocha-sinon": "^1.1.5", "sinon": "^1.17.3", |