diff options
| author | brunobar79 <brunobar79@gmail.com> | 2018-07-03 03:29:26 +0800 |
|---|---|---|
| committer | brunobar79 <brunobar79@gmail.com> | 2018-07-03 03:29:26 +0800 |
| commit | 9b0bc67066d76aca886377ac34c83e6de1c56ccd (patch) | |
| tree | 707f28e5d3976452afde09017e602eb1053789d2 /package.json | |
| parent | f19ffaf08d49f33c395a25faf3eeb6b08d5285a4 (diff) | |
| parent | 4c86f25f5bc4fa18847ca1b77e005afc3f37eddc (diff) | |
| download | tangerine-wallet-browser-9b0bc67066d76aca886377ac34c83e6de1c56ccd.tar tangerine-wallet-browser-9b0bc67066d76aca886377ac34c83e6de1c56ccd.tar.gz tangerine-wallet-browser-9b0bc67066d76aca886377ac34c83e6de1c56ccd.tar.bz2 tangerine-wallet-browser-9b0bc67066d76aca886377ac34c83e6de1c56ccd.tar.lz tangerine-wallet-browser-9b0bc67066d76aca886377ac34c83e6de1c56ccd.tar.xz tangerine-wallet-browser-9b0bc67066d76aca886377ac34c83e6de1c56ccd.tar.zst tangerine-wallet-browser-9b0bc67066d76aca886377ac34c83e6de1c56ccd.zip | |
fix merge conflicts
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/package.json b/package.json index 01c824fc6..d8b3fc306 100644 --- a/package.json +++ b/package.json @@ -108,7 +108,7 @@ "ethereumjs-wallet": "^0.6.0", "etherscan-link": "^1.0.2", "ethjs": "^0.4.0", - "ethjs-contract": "^0.2.0", + "ethjs-contract": "^0.2.3", "ethjs-ens": "^2.0.0", "ethjs-query": "^0.3.4", "express": "^4.15.5", @@ -210,7 +210,7 @@ "babel-register": "^6.7.2", "babelify": "^8.0.0", "beefy": "^2.1.5", - "brfs": "^1.4.3", + "brfs": "^1.6.1", "browserify": "^16.1.1", "chai": "^4.1.0", "chromedriver": "2.36.0", @@ -234,9 +234,9 @@ "file-loader": "^1.1.11", "fs-promise": "^2.0.3", "ganache-cli": "^6.1.0", - "ganache-core": "^2.1.0", + "ganache-core": "^2.1.3", "geckodriver": "^1.11.0", - "gh-pages": "^1.1.0", + "gh-pages": "^1.2.0", "gifencoder": "^1.1.0", "gulp": "github:gulpjs/gulp#6d71a658c61edb3090221579d8f97dbe086ba2ed", "gulp-babel": "^7.0.0", @@ -260,7 +260,7 @@ "jsdom": "^11.2.0", "jsdom-global": "^3.0.2", "jshint-stylish": "~2.2.1", - "karma": "^2.0.0", + "karma": "^2.0.4", "karma-chrome-launcher": "^2.2.0", "karma-cli": "^1.0.1", "karma-firefox-launcher": "^1.0.1", @@ -271,9 +271,9 @@ "mocha-jsdom": "^1.1.0", "mocha-sinon": "^2.0.0", "nock": "^9.0.14", - "node-sass": "^4.7.2", + "node-sass": "^4.9.0", "nsp": "^3.2.1", - "nyc": "^11.0.3", + "nyc": "^13.0.0", "open": "0.0.5", "path": "^0.12.7", "png-file-stream": "^1.0.0", @@ -296,11 +296,11 @@ "style-loader": "^0.21.0", "stylelint-config-standard": "^18.2.0", "tape": "^4.5.1", - "testem": "^2.0.0", + "testem": "^2.8.0", "through2": "^2.0.3", "vinyl-buffer": "^1.0.1", "vinyl-source-stream": "^2.0.0", - "watchify": "^3.9.0" + "watchify": "^3.11.0" }, "engines": { "node": ">=8.0.0" |