diff options
Diffstat (limited to 'contracts/core/src/artifacts/index.ts')
| -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, |