diff options
| author | brunobar79 <brunobar79@gmail.com> | 2018-08-23 01:37:47 +0800 |
|---|---|---|
| committer | brunobar79 <brunobar79@gmail.com> | 2018-08-23 01:37:47 +0800 |
| commit | 055e0f8dacc8cf3f45d31755c36270403b9130f3 (patch) | |
| tree | f6bc28e8981df5697b0e95a1c42bc7efc783e702 /package.json | |
| parent | 1286ddaaed7ca1995fe093a30c20a1ae6a929e16 (diff) | |
| parent | babd59a2dc64e15ef2a415e349ef12d5b995e2e7 (diff) | |
| download | tangerine-wallet-browser-055e0f8dacc8cf3f45d31755c36270403b9130f3.tar tangerine-wallet-browser-055e0f8dacc8cf3f45d31755c36270403b9130f3.tar.gz tangerine-wallet-browser-055e0f8dacc8cf3f45d31755c36270403b9130f3.tar.bz2 tangerine-wallet-browser-055e0f8dacc8cf3f45d31755c36270403b9130f3.tar.lz tangerine-wallet-browser-055e0f8dacc8cf3f45d31755c36270403b9130f3.tar.xz tangerine-wallet-browser-055e0f8dacc8cf3f45d31755c36270403b9130f3.tar.zst tangerine-wallet-browser-055e0f8dacc8cf3f45d31755c36270403b9130f3.zip | |
fix merge conflicts
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/package.json b/package.json index ec6ec47df..01e51fd9d 100644 --- a/package.json +++ b/package.json @@ -107,12 +107,12 @@ "eth-bin-to-ops": "^1.0.1", "eth-block-tracker": "^4.0.1", "eth-contract-metadata": "github:MetaMask/eth-contract-metadata#master", - "eth-json-rpc-middleware": "^2.4.0", - "eth-keyring-controller": "^3.1.4", "eth-ens-namehash": "^2.0.8", "eth-hd-keyring": "^1.2.2", "eth-json-rpc-filters": "^2.1.1", "eth-json-rpc-infura": "^3.0.0", + "eth-json-rpc-middleware": "^2.4.0", + "eth-keyring-controller": "^3.1.4", "eth-ledger-bridge-keyring": "^0.1.0", "eth-method-registry": "^1.0.0", "eth-phishing-detect": "^1.1.4", @@ -131,6 +131,7 @@ "ethjs-query": "^0.3.4", "express": "^4.15.5", "extension-link-enabler": "^1.0.0", + "extension-port-stream": "^1.0.0", "extensionizer": "^1.0.1", "fast-json-patch": "^2.0.4", "fast-levenshtein": "^2.0.6", @@ -157,6 +158,7 @@ "lodash.uniqby": "^4.7.0", "loglevel": "^1.4.1", "metamascara": "^2.0.0", + "metamask-inpage-provider": "^1.0.0", "metamask-logo": "^2.1.4", "mkdirp": "^0.5.1", "multihashes": "^0.4.12", @@ -206,7 +208,7 @@ "shallow-copy": "0.0.1", "sw-controller": "^1.0.3", "sw-stream": "^2.0.2", - "swappable-obj-proxy": "^1.0.2", + "swappable-obj-proxy": "^1.1.0", "textarea-caret": "^3.0.1", "valid-url": "^1.0.9", "vreme": "^3.0.2", |