diff options
| author | lokher <lokher@gmail.com> | 2022-12-06 17:04:10 +0800 |
|---|---|---|
| committer | lokher <lokher@gmail.com> | 2022-12-06 17:04:10 +0800 |
| commit | 27fc28fd2ff52e079a5bc58d6aaea4c752420615 (patch) | |
| tree | 7ac943fb1ba4f430a7220efd18f66f6a77205c30 /keyboards/keychron/k6_pro/halconf.h | |
| parent | e736133392fe6427cfb995da0787337189828272 (diff) | |
| parent | 2709b6ed616f8012ff4cfd3ee69a822a8d188351 (diff) | |
Merge upstream master
Diffstat (limited to 'keyboards/keychron/k6_pro/halconf.h')
| -rw-r--r-- | keyboards/keychron/k6_pro/halconf.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/keyboards/keychron/k6_pro/halconf.h b/keyboards/keychron/k6_pro/halconf.h index 5c817659f8..3cdd43eebf 100644 --- a/keyboards/keychron/k6_pro/halconf.h +++ b/keyboards/keychron/k6_pro/halconf.h @@ -18,9 +18,12 @@ #define HAL_USE_I2C TRUE +<<<<<<< HEAD:keyboards/keychron/k6_pro/halconf.h #ifdef BLUETOOTH_ENABLE # define PAL_USE_CALLBACKS TRUE # define HAL_USE_SERIAL TRUE #endif +======= +>>>>>>> master:keyboards/acheron/apollo/87h/gamma/halconf.h #include_next <halconf.h> |