crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix merge conflicts

Browse Source
This commit is contained in:
Leonid Logvinov 2018-01-18 14:23:54 +01:00
parent 1380cd811e
commit d41bce36be
No known key found for this signature in database
GPG Key ID: 0DD294BFDE8C95D4
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/contracts/package.json
View File

@ -54,18 +54,11 @@
"yargs": "^10.0.3" "yargs": "^10.0.3"
}, },
"dependencies": { "dependencies": {
<<<<<<< HEAD
"0x.js": "^0.30.0", "0x.js": "^0.30.0",
"@0xproject/deployer": "^0.0.1",
"@0xproject/json-schemas": "^0.7.3", "@0xproject/json-schemas": "^0.7.3",
"@0xproject/utils": "^0.2.0", "@0xproject/utils": "^0.2.0",
"@0xproject/web3-wrapper": "^0.1.5", "@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", "bluebird": "^3.5.0",
"bn.js": "^4.11.8", "bn.js": "^4.11.8",
"ethereumjs-abi": "^0.6.4", "ethereumjs-abi": "^0.6.4",