diff options
| author | brunobar79 <brunobar79@gmail.com> | 2018-08-09 02:30:49 +0800 |
|---|---|---|
| committer | brunobar79 <brunobar79@gmail.com> | 2018-08-09 02:30:49 +0800 |
| commit | 286bde606f1c42a8edf2793b78042f5ef3271894 (patch) | |
| tree | c8beb87f4726385fa766bb5ccea185055a244acb /package.json | |
| parent | 0ebdd73e027f62bb5d83f96fcbca85f4e9c9038c (diff) | |
| download | tangerine-wallet-browser-286bde606f1c42a8edf2793b78042f5ef3271894.tar tangerine-wallet-browser-286bde606f1c42a8edf2793b78042f5ef3271894.tar.gz tangerine-wallet-browser-286bde606f1c42a8edf2793b78042f5ef3271894.tar.bz2 tangerine-wallet-browser-286bde606f1c42a8edf2793b78042f5ef3271894.tar.lz tangerine-wallet-browser-286bde606f1c42a8edf2793b78042f5ef3271894.tar.xz tangerine-wallet-browser-286bde606f1c42a8edf2793b78042f5ef3271894.tar.zst tangerine-wallet-browser-286bde606f1c42a8edf2793b78042f5ef3271894.zip | |
fix merge conflicts
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/package.json b/package.json index 96b0829db..be06a16f3 100644 --- a/package.json +++ b/package.json @@ -74,7 +74,7 @@ ] }, "dependencies": { - "@material-ui/core": "^1.0.0", + "@material-ui/core": "1.0.0", "abi-decoder": "^1.0.9", "asmcrypto.js": "0.22.0", "async": "^2.5.0", @@ -105,7 +105,7 @@ "eth-bin-to-ops": "^1.0.1", "eth-contract-metadata": "github:MetaMask/eth-contract-metadata#master", "eth-ens-namehash": "^2.0.8", - "eth-hd-keyring": "^2.0.0", + "eth-hd-keyring": "^1.2.2", "eth-json-rpc-filters": "^1.2.6", "eth-json-rpc-infura": "^3.0.0", "eth-method-registry": "^1.0.0", @@ -113,7 +113,7 @@ "eth-query": "^2.1.2", "eth-sig-util": "^1.4.2", "eth-token-tracker": "^1.1.4", - "eth-trezor-keyring": "^0.1.0", + "eth-trezor-keyring": "github:MetaMask/eth-trezor-keyring#trezor-v5", "ethereumjs-abi": "^0.6.4", "ethereumjs-tx": "^1.3.0", "ethereumjs-util": "github:ethereumjs/ethereumjs-util#ac5d0908536b447083ea422b435da27f26615de9", @@ -198,7 +198,6 @@ "semaphore": "^1.0.5", "semver": "^5.4.1", "shallow-copy": "0.0.1", - "superstatic": "^5.0.2", "sw-controller": "^1.0.3", "sw-stream": "^2.0.2", "textarea-caret": "^3.0.1", @@ -228,7 +227,7 @@ "brfs": "^1.6.1", "browserify": "^16.1.1", "chai": "^4.1.0", - "chromedriver": "2.36.0", + "chromedriver": "^2.41.0", "clipboardy": "^1.2.3", "compression": "^1.7.1", "coveralls": "^3.0.0", @@ -245,7 +244,7 @@ "eslint-plugin-mocha": "^5.0.0", "eslint-plugin-react": "^7.4.0", "eth-json-rpc-middleware": "^1.6.0", - "eth-keyring-controller": "^4.0.0", + "eth-keyring-controller": "^3.3.1", "file-loader": "^1.1.11", "fs-promise": "^2.0.3", "ganache-cli": "^6.1.0", @@ -308,6 +307,7 @@ "shell-parallel": "^1.0.3", "sinon": "^5.0.0", "source-map": "^0.7.2", + "static-server": "^2.2.1", "style-loader": "^0.21.0", "stylelint-config-standard": "^18.2.0", "tape": "^4.5.1", |