diff options
Diffstat (limited to 'contracts/core/package.json')
-rw-r--r-- | contracts/core/package.json | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/contracts/core/package.json b/contracts/core/package.json index bdfd7078f..6fbde5538 100644 --- a/contracts/core/package.json +++ b/contracts/core/package.json @@ -33,8 +33,7 @@ "lint-contracts": "solhint contracts/**/**/**/**/*.sol" }, "config": { - "abis": - "generated-artifacts/@(AssetProxyOwner|DummyERC20Token|DummyERC721Receiver|DummyERC721Token|DummyMultipleReturnERC20Token|DummyNoReturnERC20Token|ERC20Token|ERC20Proxy|ERC721Token|ERC721Proxy|Forwarder|Exchange|ExchangeWrapper|IAssetData|IAssetProxy|InvalidERC721Receiver|MixinAuthorizable|MultiAssetProxy|MultiSigWallet|MultiSigWalletWithTimeLock|OrderValidator|ReentrantERC20Token|TestAssetProxyOwner|TestAssetProxyDispatcher|TestConstants|TestExchangeInternals|TestLibBytes|TestLibs|TestSignatureValidator|TestStaticCallReceiver|Validator|Wallet|Whitelist|WETH9|ZRXToken).json" + "abis": "generated-artifacts/@(AssetProxyOwner|DummyERC20Token|DummyERC721Receiver|DummyERC721Token|DummyMultipleReturnERC20Token|DummyNoReturnERC20Token|ERC20Token|ERC20Proxy|ERC721Token|ERC721Proxy|Forwarder|Exchange|ExchangeWrapper|IAssetData|IAssetProxy|InvalidERC721Receiver|MixinAuthorizable|MultiAssetProxy|OrderValidator|ReentrantERC20Token|TestAssetProxyOwner|TestAssetProxyDispatcher|TestConstants|TestExchangeInternals|TestLibBytes|TestLibs|TestSignatureValidator|TestStaticCallReceiver|Validator|Wallet|Whitelist|WETH9|ZRXToken).json" }, "repository": { "type": "git", @@ -74,14 +73,9 @@ "yargs": "^10.0.3" }, "dependencies": { -<<<<<<< HEAD "@0x/base-contract": "^3.0.8", "@0x/order-utils": "^3.0.4", -======= "@0x/contracts-multisig": "^1.0.0", - "@0x/base-contract": "^3.0.7", - "@0x/order-utils": "^3.0.3", ->>>>>>> Refactor contracts-core into contracts-multisig, contracts-core and contracts-test-utils "@0x/types": "^1.3.0", "@0x/typescript-typings": "^3.0.4", "@0x/utils": "^2.0.6", |