diff options
| author | brunobar79 <brunobar79@gmail.com> | 2018-07-04 01:31:30 +0800 |
|---|---|---|
| committer | brunobar79 <brunobar79@gmail.com> | 2018-07-04 01:31:30 +0800 |
| commit | 3290421e2f16bd0ea1b13ba3f3d93fc4d233c750 (patch) | |
| tree | dfbcfb70609fd24074dad6686f447a452313c6c6 /package-lock.json | |
| parent | 85fd75c21f0e64817b3d4c4d51f37649e3a81233 (diff) | |
| parent | 1f0cf11af1c94e750bbc4c5238c3ee028350a6c6 (diff) | |
| download | tangerine-wallet-browser-3290421e2f16bd0ea1b13ba3f3d93fc4d233c750.tar tangerine-wallet-browser-3290421e2f16bd0ea1b13ba3f3d93fc4d233c750.tar.gz tangerine-wallet-browser-3290421e2f16bd0ea1b13ba3f3d93fc4d233c750.tar.bz2 tangerine-wallet-browser-3290421e2f16bd0ea1b13ba3f3d93fc4d233c750.tar.lz tangerine-wallet-browser-3290421e2f16bd0ea1b13ba3f3d93fc4d233c750.tar.xz tangerine-wallet-browser-3290421e2f16bd0ea1b13ba3f3d93fc4d233c750.tar.zst tangerine-wallet-browser-3290421e2f16bd0ea1b13ba3f3d93fc4d233c750.zip | |
fix merge conflicts
Diffstat (limited to 'package-lock.json')
| -rw-r--r-- | package-lock.json | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/package-lock.json b/package-lock.json index b25d4e3e9..6116def77 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8020,9 +8020,8 @@ } }, "eth-contract-metadata": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/eth-contract-metadata/-/eth-contract-metadata-1.8.0.tgz", - "integrity": "sha512-Zr6KUsWnonyBavHZbi2T3g2Bpp6Yyob+/RwQ8AkvRec5UB1yS53pv5c97ll1q1a2+3lRv3KZHMcssqJrsypNHg==" + "version": "github:MetaMask/eth-contract-metadata#2da362052a312dc6c72a7eec116abf6284664f50", + "from": "github:MetaMask/eth-contract-metadata#master" }, "eth-ens-namehash": { "version": "1.0.2", @@ -15696,6 +15695,26 @@ "xtend": "~2.1.1" }, "dependencies": { + "eth-contract-metadata": { + "version": "github:MetaMask/eth-contract-metadata#2da362052a312dc6c72a7eec116abf6284664f50", + "from": "github:MetaMask/eth-contract-metadata#master" + }, + "eth-ens-namehash": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/eth-ens-namehash/-/eth-ens-namehash-1.0.2.tgz", + "integrity": "sha1-Bezda6wtf9e8XKhKmTxrrZ2k7bk=", + "requires": { + "idna-uts46": "^1.0.1", + "js-sha3": "^0.5.7" + }, + "dependencies": { + "js-sha3": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.5.7.tgz", + "integrity": "sha1-DU/9gALVMzqrr0oj7tL2N0yfKOc=" + } + } + }, "isarray": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", |