Delete merge conflict artifact (#1758)

This commit is contained in:
F. Eugene Aumson
2019-04-04 18:08:13 -04:00
committed by GitHub
parent ad3e3b8421
commit fdcad84cee

View File

@@ -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: ...
...
...