diff options
| author | brunobar79 <brunobar79@gmail.com> | 2018-08-09 03:40:04 +0800 |
|---|---|---|
| committer | brunobar79 <brunobar79@gmail.com> | 2018-08-09 03:40:04 +0800 |
| commit | 656afeefad6ed5f41171ca839815931ed0702396 (patch) | |
| tree | b01771ef996bac0b80fbc5a729731de07930d851 /package.json | |
| parent | f269021dc3ea78c6359b9db50db30fdd549020b7 (diff) | |
| parent | 1d4ee6bf765f0b7fc80fa7f95618e8de3844488d (diff) | |
| download | tangerine-wallet-browser-656afeefad6ed5f41171ca839815931ed0702396.tar tangerine-wallet-browser-656afeefad6ed5f41171ca839815931ed0702396.tar.gz tangerine-wallet-browser-656afeefad6ed5f41171ca839815931ed0702396.tar.bz2 tangerine-wallet-browser-656afeefad6ed5f41171ca839815931ed0702396.tar.lz tangerine-wallet-browser-656afeefad6ed5f41171ca839815931ed0702396.tar.xz tangerine-wallet-browser-656afeefad6ed5f41171ca839815931ed0702396.tar.zst tangerine-wallet-browser-656afeefad6ed5f41171ca839815931ed0702396.zip | |
fix merge conflicts
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/package.json b/package.json index ad77174f7..29295a65b 100644 --- a/package.json +++ b/package.json @@ -74,7 +74,7 @@ ] }, "dependencies": { - "@material-ui/core": "^1.0.0", + "@material-ui/core": "1.0.0", "@zxing/library": "^0.7.0", "abi-decoder": "^1.0.9", "asmcrypto.js": "0.22.0", @@ -107,7 +107,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", @@ -247,7 +247,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", |