updates from tindie

boards/jpconstantineau/vcolmx44/README.md

@@ -1,23 +1,14 @@
 # JPConstantineau's VColMX44: An Atreus44 clone
 
-<<<<<<< HEAD
 ![VColMX44](https://cdn.tindiemedia.com/images/resize/5oEyXgxteB6wYjXv8kFC1B3YqOk=/p/full-fit-in/2400x1600/i/556481/products/2021-10-20T05%3A14%3A24.776Z-PXL_20211016_060203733.jpg?1634681706v)
 
-=======
-![Atreus44](https://cdn.tindiemedia.com/images/resize/tbqfM8nhMn0hoDM0ZkwYxM23mU0=/p/full-fit-in/2400x1600/i/556481/products/2021-10-15T15%3A33%3A13.288Z-qj04uaoo2ht71.jpg?1634287023)
-Image to be updated.
->>>>>>> 9e830a1 (adding jpconstantineau's boards)
 
 44 Keys RGB Keyboard inspired from Keyboardio's Atreus with a Raspberry Pi Pico
 
 kb.py is designed to work with the [Pico CircuitPython UF2](https://circuitpython.org/board/raspberry_pi_pico/)
 
 Retailers (USA)  
-<<<<<<< HEAD
 [BlueMicro Store on Tindie](https://www.tindie.com/products/jpconstantineau/raspberry-pi-pico-44-keys-rgb-keyboard/)
-=======
-[BlueMicro Store on Tindie](https://www.tindie.com/products/jpconstantineau/low-profile-44-keys-rgb-keyboard-pcb-with-a-rp2040/)  Link to be updated
->>>>>>> 9e830a1 (adding jpconstantineau's boards)
 
 Extensions enabled by default  
 - [Layers](https://github.com/KMKfw/kmk_firmware/tree/master/docs/layers.md) Need more keys than switches? Use layers.

boards/jpconstantineau/vcolmx44/kb.py

@@ -5,11 +5,7 @@ from kmk.matrix import DiodeOrientation
 
 
 class KMKKeyboard(_KMKKeyboard):
-<<<<<<< HEAD
     col_pins = (
-=======
-    row_pins = (
->>>>>>> 9e830a1 (adding jpconstantineau's boards)
         board.GP20,
         board.GP19,
         board.GP18,
@@ -22,11 +18,7 @@ class KMKKeyboard(_KMKKeyboard):
         board.GP1,
         board.GP0,
     )
-<<<<<<< HEAD
     row_pins = (board.GP22, board.GP21, board.GP14, board.GP15)
-=======
-    col_pins = (board.GP22, board.GP21, board.GP14, board.GP15)
->>>>>>> 9e830a1 (adding jpconstantineau's boards)
     diode_orientation = DiodeOrientation.COL2ROW
     rgb_pixel_pin = board.GP28
     rgb_num_pixels = 44