From d907b403788576c7d4fe51090a561f1e951126e2 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Wed, 22 Aug 2018 13:12:42 +0100
Subject: Fix remaining merge issues

---
 packages/order-watcher/src/artifacts.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'packages/order-watcher/src')

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';
-- 
cgit v1.2.3