X-Git-Url: https://git.ayoreis.com/hackapet/Adafruit_Blinka_Displayio.git/blobdiff_plain/3e217487a005ed9ba2e45e27fa03afc8fff3f424..4f15fcb2fb62d7a5ec74c233602f99cf8144dca0:/displayio/_fourwire.py

diff --git a/displayio/_fourwire.py b/displayio/_fourwire.py
index 65b7654..c9cceda 100644
--- a/displayio/_fourwire.py
+++ b/displayio/_fourwire.py
@@ -158,14 +158,11 @@ 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)
+
+        return True
 
     def _end_transaction(self) -> None:
         """End the SPI transaction by unlocking and setting Chip Select"""