diff options
| author | fragosti <francesco.agosti93@gmail.com> | 2018-06-07 07:36:11 +0800 |
|---|---|---|
| committer | fragosti <francesco.agosti93@gmail.com> | 2018-06-07 07:36:11 +0800 |
| commit | e0d5b9daf84cba31bbbcd2cfbe1f64623eace61a (patch) | |
| tree | 84929c7ae4e95896dacfb69517aaaba97ec8ad85 /package.json | |
| parent | a97d77064aacda3de74b04894f110b05298c5ca8 (diff) | |
| parent | 785b9811f30869f01242ce9ff81c282bf7f5352f (diff) | |
| download | dexon-sol-tools-e0d5b9daf84cba31bbbcd2cfbe1f64623eace61a.tar dexon-sol-tools-e0d5b9daf84cba31bbbcd2cfbe1f64623eace61a.tar.gz dexon-sol-tools-e0d5b9daf84cba31bbbcd2cfbe1f64623eace61a.tar.bz2 dexon-sol-tools-e0d5b9daf84cba31bbbcd2cfbe1f64623eace61a.tar.lz dexon-sol-tools-e0d5b9daf84cba31bbbcd2cfbe1f64623eace61a.tar.xz dexon-sol-tools-e0d5b9daf84cba31bbbcd2cfbe1f64623eace61a.tar.zst dexon-sol-tools-e0d5b9daf84cba31bbbcd2cfbe1f64623eace61a.zip | |
Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into feature/improve-linting
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/package.json b/package.json index 7c54c1a18..f25438224 100644 --- a/package.json +++ b/package.json @@ -46,6 +46,7 @@ "wsrun": "^2.2.0" }, "resolutions": { - "ethereumjs-tx": "0xProject/ethereumjs-tx#fake-tx-include-signature-by-default" + "ethereumjs-tx": "0xProject/ethereumjs-tx#fake-tx-include-signature-by-default", + "ethers": "0xproject/ethers.js#eip-838-reasons" } } |