diff options
| author | brunobar79 <brunobar79@gmail.com> | 2018-11-07 09:21:19 +0800 |
|---|---|---|
| committer | brunobar79 <brunobar79@gmail.com> | 2018-11-07 09:21:19 +0800 |
| commit | c651212025ab7cd0309d96be6687c1eba35ab9fa (patch) | |
| tree | fa5a6020daae332c5df47bdee3492e8a079375e3 /package.json | |
| parent | 9c1b2108f69334884473eb95758e2d1c02c984d6 (diff) | |
| parent | 7f944923d170d6e7e04f6e238d2fd5f80abe3161 (diff) | |
| download | tangerine-wallet-browser-c651212025ab7cd0309d96be6687c1eba35ab9fa.tar tangerine-wallet-browser-c651212025ab7cd0309d96be6687c1eba35ab9fa.tar.gz tangerine-wallet-browser-c651212025ab7cd0309d96be6687c1eba35ab9fa.tar.bz2 tangerine-wallet-browser-c651212025ab7cd0309d96be6687c1eba35ab9fa.tar.lz tangerine-wallet-browser-c651212025ab7cd0309d96be6687c1eba35ab9fa.tar.xz tangerine-wallet-browser-c651212025ab7cd0309d96be6687c1eba35ab9fa.tar.zst tangerine-wallet-browser-c651212025ab7cd0309d96be6687c1eba35ab9fa.zip | |
fix merge conflicts
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/package.json b/package.json index 4114376a0..dd7496929 100644 --- a/package.json +++ b/package.json @@ -82,6 +82,7 @@ }, "dependencies": { "@material-ui/core": "1.0.0", + "@sentry/browser": "^4.1.1", "@zxing/library": "^0.8.0", "abi-decoder": "^1.0.9", "asmcrypto.js": "0.22.0", @@ -97,7 +98,7 @@ "browserify-derequire": "^0.9.4", "browserify-unibabel": "^3.0.0", "classnames": "^2.2.5", - "clone": "^2.1.1", + "clone": "^2.1.2", "copy-to-clipboard": "^3.0.8", "css-loader": "^0.28.11", "currency-formatter": "^1.4.2", @@ -112,7 +113,7 @@ "ensnare": "^1.0.0", "eslint-plugin-react": "^7.4.0", "eth-bin-to-ops": "^1.0.1", - "eth-block-tracker": "^4.0.3", + "eth-block-tracker": "^4.1.0", "eth-contract-metadata": "github:MetaMask/eth-contract-metadata#master", "eth-ens-namehash": "^2.0.8", "eth-hd-keyring": "^1.2.2", @@ -186,7 +187,6 @@ "pumpify": "^1.3.4", "qrcode-npm": "0.0.3", "ramda": "^0.24.1", - "raven-js": "^3.24.2", "react": "^15.6.2", "react-addons-css-transition-group": "^15.6.0", "react-dom": "^15.6.2", @@ -261,7 +261,7 @@ "eslint-plugin-json": "^1.2.0", "eslint-plugin-mocha": "^5.0.0", "eslint-plugin-react": "^7.4.0", - "eth-json-rpc-middleware": "^3.1.3", + "eth-json-rpc-middleware": "^3.1.6", "eth-keyring-controller": "^3.3.1", "fetch-mock": "^6.5.2", "file-loader": "^1.1.11", |