diff options
Diffstat (limited to 'packages/contracts/package.json')
| -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", |