resolve merge conflicts. Remove un-used typing imports.

Author: FoamyGuy

adafruit_mcp3xxx/mcp3004.py

@@ -18,14 +18,6 @@
 
 from .mcp3xxx import MCP3xxx
 
-try:
-    import typing
-
-    from busio import SPI
-    from digitalio import DigitalInOut
-except ImportError:
-    pass
-
 # MCP3004 Pin Mapping
 P0 = 0
 P1 = 1

adafruit_mcp3xxx/mcp3008.py

@@ -18,14 +18,6 @@
 
 from .mcp3xxx import MCP3xxx
 
-try:
-    import typing
-
-    from busio import SPI
-    from digitalio import DigitalInOut
-except ImportError:
-    pass
-
 # MCP3008 Pin Mapping
 P0 = 0
 P1 = 1

adafruit_mcp3xxx/mcp3202.py

@@ -17,6 +17,7 @@
 <https://ww1.microchip.com/downloads/aemDocuments/documents/APID/ProductDocuments/DataSheets/21034F.pdf#G1.1063009>`_
 section of the MCP3202 datasheet.
 """
+
 from .mcp3xxx import MCP3xxx
 
 # MCP3202 Pin Mapping