diff options
author | Fabio Berger <me@fabioberger.com> | 2018-06-27 17:02:40 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-27 17:02:40 +0800 |
commit | f9fab216e9874a2457e614e55209705dd7828386 (patch) | |
tree | 5d9c16c1a51513a7da60cb6a4278845511144228 /package.json | |
parent | e59c57106cd15d45efb6f4100529cf6e5dfe71a8 (diff) | |
parent | 84bd54ba4025a33f4e311ec66d81d58b45e54d6b (diff) | |
download | dexon-sol-tools-f9fab216e9874a2457e614e55209705dd7828386.tar dexon-sol-tools-f9fab216e9874a2457e614e55209705dd7828386.tar.gz dexon-sol-tools-f9fab216e9874a2457e614e55209705dd7828386.tar.bz2 dexon-sol-tools-f9fab216e9874a2457e614e55209705dd7828386.tar.lz dexon-sol-tools-f9fab216e9874a2457e614e55209705dd7828386.tar.xz dexon-sol-tools-f9fab216e9874a2457e614e55209705dd7828386.tar.zst dexon-sol-tools-f9fab216e9874a2457e614e55209705dd7828386.zip |
Merge branch 'v2-prototype' into invalid-argument-error
Diffstat (limited to 'package.json')
-rw-r--r-- | package.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package.json b/package.json index 015dafb64..a960fd569 100644 --- a/package.json +++ b/package.json @@ -25,6 +25,7 @@ "build": "wsrun build $PKG --fast-exit -r --stages", "build:monorepo_scripts": "PKG=@0xproject/monorepo-scripts yarn build", "clean": "wsrun clean $PKG --fast-exit -r --parallel", + "remove_node_modules": "lerna clean --yes; rm -rf node_modules", "rebuild": "run-s clean build", "test": "wsrun test $PKG --fast-exit --serial --exclude-missing", "stage_docs": "wsrun docs:stage $PKG --fast-exit --parallel --exclude-missing", @@ -47,7 +48,6 @@ "source-map-support": "^0.5.6" }, "resolutions": { - "ethereumjs-tx": "0xProject/ethereumjs-tx#fake-tx-include-signature-by-default", "ethers": "0xproject/ethers.js#eip-838-reasons" } } |