Merge branch 'add_preonic' of github.com:shurikai/zmk into add_preonic

This commit is contained in:
Jason Chestnut 2020-09-25 11:28:30 -04:00
commit bf6ffdce3a

View file

@ -26,4 +26,7 @@ CONFIG_CLOCK_STM32_PLL_MULTIPLIER=9
CONFIG_CLOCK_STM32_AHB_PRESCALER=1
CONFIG_CLOCK_STM32_APB1_PRESCALER=2
CONFIG_CLOCK_STM32_APB2_PRESCALER=1
<<<<<<< HEAD
CONFIG_ZMK_KSCAN_MATRIX_POLLING=y
=======
>>>>>>> aad447758e88ce839bdbd8f94259d1402ab1c8e1