From fdcad84cee45781a06cab6b6b17f4a48c275d713 Mon Sep 17 00:00:00 2001
From: "F. Eugene Aumson" <feuGeneA@users.noreply.github.com>
Date: Thu, 4 Apr 2019 18:08:13 -0400
Subject: [PATCH] Delete merge conflict artifact (#1758)

---
 .../stubs/web3/__init___BASE_31011.pyi        | 26 -------------------
 1 file changed, 26 deletions(-)
 delete mode 100644 python-packages/order_utils/stubs/web3/__init___BASE_31011.pyi

diff --git a/python-packages/order_utils/stubs/web3/__init___BASE_31011.pyi b/python-packages/order_utils/stubs/web3/__init___BASE_31011.pyi
deleted file mode 100644
index fcecc7434c..0000000000
--- a/python-packages/order_utils/stubs/web3/__init___BASE_31011.pyi
+++ /dev/null
@@ -1,26 +0,0 @@
-from typing import Dict, Optional, Union
-
-from web3.utils import datatypes
-
-
-class Web3:
-    class HTTPProvider: ...
-
-    def __init__(self, provider: HTTPProvider) -> None: ...
-
-    @staticmethod
-    def sha3(
-        primitive: Optional[Union[bytes, int, None]] = None,
-        text: Optional[str] = None,
-        hexstr: Optional[str] = None
-    ) -> bytes: ...
-
-    class net:
-        version: str
-        ...
-
-    class eth:
-        @staticmethod
-        def contract(address: str, abi: Dict) -> datatypes.Contract: ...
-        ...
-    ...