diff options
| author | Fabio Berger <me@fabioberger.com> | 2018-04-12 18:39:00 +0800 |
|---|---|---|
| committer | Amir Bandeali <abandeali1@gmail.com> | 2018-04-21 04:56:17 +0800 |
| commit | f9d4966000b412bbd66ebc660d49417dedc81ff1 (patch) | |
| tree | 21a33bf068e19d78b45f2d336978bb69da79b7db | |
| parent | ad2289935d6d8fc9fc3d1ee1be0f1babf3462927 (diff) | |
| download | dexon-sol-tools-f9d4966000b412bbd66ebc660d49417dedc81ff1.tar dexon-sol-tools-f9d4966000b412bbd66ebc660d49417dedc81ff1.tar.gz dexon-sol-tools-f9d4966000b412bbd66ebc660d49417dedc81ff1.tar.bz2 dexon-sol-tools-f9d4966000b412bbd66ebc660d49417dedc81ff1.tar.lz dexon-sol-tools-f9d4966000b412bbd66ebc660d49417dedc81ff1.tar.xz dexon-sol-tools-f9d4966000b412bbd66ebc660d49417dedc81ff1.tar.zst dexon-sol-tools-f9d4966000b412bbd66ebc660d49417dedc81ff1.zip | |
Fix merge
| -rw-r--r-- | packages/contracts/package.json | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/contracts/package.json b/packages/contracts/package.json index 30867476f..78d50d888 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -26,8 +26,8 @@ "test:circleci": "yarn test:coverage" }, "config": { - "abis": "../migrations/src/artifacts/@(DummyToken|TokenTransferProxy|Exchange|TokenRegistry|MultiSigWallet|MultiSigWalletWithTimeLock|MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress|TokenRegistry|ZRXToken|Arbitrage|EtherDelta|AccountLevels).json", - "contracts": "Exchange,DummyToken,ZRXToken,Token,WETH9,TokenTransferProxy,MultiSigWallet,MultiSigWalletWithTimeLock,MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress,MaliciousToken,TokenRegistry,Arbitrage,EtherDelta,AccountLevels" + "abis": "../migrations/src/artifacts/@(DummyToken|TokenTransferProxy|Exchange|TokenRegistry|MultiSigWallet|MultiSigWalletWithTimeLock|MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress|TokenRegistry|ZRXToken).json", + "contracts": "Exchange,DummyToken,ZRXToken,Token,WETH9,TokenTransferProxy,MultiSigWallet,MultiSigWalletWithTimeLock,MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress,MaliciousToken,TokenRegistry" }, "repository": { "type": "git", |