fixed

boards/crowboard/main.py

@@ -1,16 +1,10 @@
 import board
 import busio as io
 
-<<<<<<< Updated upstream
-
-from kmk.kmk_keyboard import KMKKeyboard
-
-=======
 from kb import KMKKeyboard
 
->>>>>>> Stashed changes
-
 from kmk.keys import KC
+from kmk.kmk_keyboard import KMKKeyboard
 from kmk.modules.layers import Layers
 from kmk.modules.modtap import ModTap
 from kmk.scanners import DiodeOrientation
@@ -68,8 +62,6 @@ keyboard.keymap = [
 
      ]
 ]
-<<<<<<< Updated upstream
-=======
 
 # Uncomment for Trackball
 # from kmk.modules.pimoroni_trackball import Trackball, TrackballMode
@@ -97,7 +89,6 @@ keyboard.keymap = [
 #                      ]
 
 # keyboard.debug_enabled = True
->>>>>>> Stashed changes
 
 if __name__ == '__main__':
     keyboard.go()