diff options
| author | Leonid Logvinov <logvinov.leon@gmail.com> | 2018-01-18 21:23:54 +0800 |
|---|---|---|
| committer | Leonid Logvinov <logvinov.leon@gmail.com> | 2018-01-18 21:23:54 +0800 |
| commit | d41bce36be3cb7a08e2dc6a8692a134236b0e5dc (patch) | |
| tree | d31d82e5c756771be5a027ee5b2ac5a271b5dab4 | |
| parent | 1380cd811e5efa557e0225233e9bb1fe564c93e7 (diff) | |
| download | dexon-sol-tools-d41bce36be3cb7a08e2dc6a8692a134236b0e5dc.tar dexon-sol-tools-d41bce36be3cb7a08e2dc6a8692a134236b0e5dc.tar.gz dexon-sol-tools-d41bce36be3cb7a08e2dc6a8692a134236b0e5dc.tar.bz2 dexon-sol-tools-d41bce36be3cb7a08e2dc6a8692a134236b0e5dc.tar.lz dexon-sol-tools-d41bce36be3cb7a08e2dc6a8692a134236b0e5dc.tar.xz dexon-sol-tools-d41bce36be3cb7a08e2dc6a8692a134236b0e5dc.tar.zst dexon-sol-tools-d41bce36be3cb7a08e2dc6a8692a134236b0e5dc.zip | |
Fix merge conflicts
| -rw-r--r-- | packages/contracts/package.json | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/packages/contracts/package.json b/packages/contracts/package.json index 9daa2c4f2..0f70ab308 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -54,18 +54,11 @@ "yargs": "^10.0.3" }, "dependencies": { -<<<<<<< HEAD "0x.js": "^0.30.0", + "@0xproject/deployer": "^0.0.1", "@0xproject/json-schemas": "^0.7.3", "@0xproject/utils": "^0.2.0", "@0xproject/web3-wrapper": "^0.1.5", -======= - "0x.js": "^0.29.2", - "@0xproject/deployer": "^0.0.1", - "@0xproject/json-schemas": "^0.7.2", - "@0xproject/utils": "^0.1.3", - "@0xproject/web3-wrapper": "^0.1.4", ->>>>>>> Move deployer to a separate package "bluebird": "^3.5.0", "bn.js": "^4.11.8", "ethereumjs-abi": "^0.6.4", |