Adding support for the BeagleV Starfive, chip VIC-U7

Author: Alvaro Figueroa

adafruit_platformdetect/board.py

@@ -245,20 +245,9 @@ def _beaglebone_id(self):
                     return model
 
         board_value = self.detector.get_armbian_release_field("BOARD")
-<<<<<<< HEAD
 
         if board_value == "freedom-u74-arty":
             return boards.BEAGLEV_STARFIV
-=======
-        board = None
-
-        if board_value == "freedom-u74-arty":
-            board = boards.BEAGLEV_STARFIV
-
-        if self.detector.chip.id != chips.BCi:
-            # Something else, not a Pi.
-            return None
->>>>>>> d720af9... Adding support for the BeagleV Starfive, chip VIC-U7
 
         return None