diff options
| author | Leonid Logvinov <logvinov.leon@gmail.com> | 2018-12-03 19:08:34 +0800 |
|---|---|---|
| committer | Leonid Logvinov <logvinov.leon@gmail.com> | 2018-12-03 19:09:29 +0800 |
| commit | a5b6ce6114fb9fe6c69a0a058bc79103d059e8b7 (patch) | |
| tree | 00b0f613f97a114b58256e4eb87faf7bb8d8e16e | |
| parent | 0d3fb79c059f5e749d0a66d77348baf3fa28cc5d (diff) | |
| download | dexon-sol-tools-a5b6ce6114fb9fe6c69a0a058bc79103d059e8b7.tar dexon-sol-tools-a5b6ce6114fb9fe6c69a0a058bc79103d059e8b7.tar.gz dexon-sol-tools-a5b6ce6114fb9fe6c69a0a058bc79103d059e8b7.tar.bz2 dexon-sol-tools-a5b6ce6114fb9fe6c69a0a058bc79103d059e8b7.tar.lz dexon-sol-tools-a5b6ce6114fb9fe6c69a0a058bc79103d059e8b7.tar.xz dexon-sol-tools-a5b6ce6114fb9fe6c69a0a058bc79103d059e8b7.tar.zst dexon-sol-tools-a5b6ce6114fb9fe6c69a0a058bc79103d059e8b7.zip | |
Fix merge conflict
| -rw-r--r-- | contracts/core/src/artifacts/index.ts | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/contracts/core/src/artifacts/index.ts b/contracts/core/src/artifacts/index.ts index 14a04fcd4..e2161f3f9 100644 --- a/contracts/core/src/artifacts/index.ts +++ b/contracts/core/src/artifacts/index.ts @@ -56,12 +56,7 @@ export const artifacts = { IWallet: IWallet as ContractArtifact, InvalidERC721Receiver: InvalidERC721Receiver as ContractArtifact, MixinAuthorizable: MixinAuthorizable as ContractArtifact, -<<<<<<< HEAD MultiAssetProxy: MultiAssetProxy as ContractArtifact, - MultiSigWallet: MultiSigWallet as ContractArtifact, - MultiSigWalletWithTimeLock: MultiSigWalletWithTimeLock as ContractArtifact, -======= ->>>>>>> Remove multisig contracts from the core list of contracts OrderValidator: OrderValidator as ContractArtifact, ReentrantERC20Token: ReentrantERC20Token as ContractArtifact, TestAssetProxyDispatcher: TestAssetProxyDispatcher as ContractArtifact, |