Resolving merge conflict

[Adafruit_Blinka-hackapet.git] / src / board.py

diff --git a/src/board.py b/src/board.py
index 5669a5735edbd6e443f2debf80ddf686cdc9dd4a..06f95efc1e2b10def07ebca222779a9a0a0a029c 100755 (executable)
--- a/src/board.py
+++ b/src/board.py
@@ -115,6 +115,9 @@ elif board_id == ap_board.MICROCHIP_MCP2221:
 elif board_id == ap_board.SIFIVE_UNLEASHED:
     from adafruit_blinka.board.hifive_unleashed import *
 
+elif board_id == ap_board.PINE64:
+    from adafruit_blinka.board.pine64 import *
+
 elif "sphinx" in sys.modules:
     pass