diff options
| author | Fabio Berger <me@fabioberger.com> | 2018-08-22 20:12:42 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2018-08-22 20:12:42 +0800 |
| commit | d907b403788576c7d4fe51090a561f1e951126e2 (patch) | |
| tree | 52476a8603aba176cf1afb9bb16fbc5c40daea6b /packages/order-watcher/src | |
| parent | 0248add542ac801bcb021fa7b13c182baec5612e (diff) | |
| download | dexon-sol-tools-d907b403788576c7d4fe51090a561f1e951126e2.tar dexon-sol-tools-d907b403788576c7d4fe51090a561f1e951126e2.tar.gz dexon-sol-tools-d907b403788576c7d4fe51090a561f1e951126e2.tar.bz2 dexon-sol-tools-d907b403788576c7d4fe51090a561f1e951126e2.tar.lz dexon-sol-tools-d907b403788576c7d4fe51090a561f1e951126e2.tar.xz dexon-sol-tools-d907b403788576c7d4fe51090a561f1e951126e2.tar.zst dexon-sol-tools-d907b403788576c7d4fe51090a561f1e951126e2.zip | |
Fix remaining merge issues
Diffstat (limited to 'packages/order-watcher/src')
| -rw-r--r-- | packages/order-watcher/src/artifacts.ts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/order-watcher/src/artifacts.ts b/packages/order-watcher/src/artifacts.ts index d47e619c2..520066a24 100644 --- a/packages/order-watcher/src/artifacts.ts +++ b/packages/order-watcher/src/artifacts.ts @@ -1,4 +1,4 @@ -import { ContractArtifact } from '@0xproject/sol-compiler'; +import { ContractArtifact } from 'ethereum-types'; import * as ERC20Token from './artifacts/ERC20Token.json'; import * as ERC721Token from './artifacts/ERC721Token.json'; |