merge conflict

Author: joente

thingsdb/client/client.py

@@ -5,11 +5,7 @@
 import time
 from collections import defaultdict
 from ssl import SSLContext, PROTOCOL_TLS
-<<<<<<< HEAD
 from typing import Any
-=======
-from typing import Optional, Union, Any, List, Tuple
->>>>>>> 032903ac574ee0bd798375acf264f6c100916d3d
 from concurrent.futures import CancelledError
 from .buildin import Buildin
 from .protocol import Proto, Protocol, ProtocolWS