make chip_select pin optional in SPI four wire

[hackapet/Adafruit_Blinka_Displayio.git] / displayio / _fourwire.py

diff --git a/displayio/_fourwire.py b/displayio/_fourwire.py
index 65b7654d4f3b32238d735d2ccdd3ebb25c57c9fa..1cf1682a2fe8dba60b61bd7ceead0572a3705044 100644 (file)
--- a/displayio/_fourwire.py
+++ b/displayio/_fourwire.py
@@ -158,14 +158,9 @@ class FourWire:
         self._spi.configure(
             baudrate=self._frequency, polarity=self._polarity, phase=self._phase
         )
-<<<<<<< HEAD
-        self._chip_select.value = False
-        return True
-=======
 
         if self._chip_select is not None:
             self._chip_select.value = False
->>>>>>> 87a1bde (make chip_select pin optional in SPI four wire)
 
     def _end_transaction(self) -> None:
         """End the SPI transaction by unlocking and setting Chip Select"""