diff options
Diffstat (limited to 'keyboards/lets_split/rev2/rev2.h')
| -rw-r--r-- | keyboards/lets_split/rev2/rev2.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/keyboards/lets_split/rev2/rev2.h b/keyboards/lets_split/rev2/rev2.h index 2a2246f05..9e251ca57 100644 --- a/keyboards/lets_split/rev2/rev2.h +++ b/keyboards/lets_split/rev2/rev2.h @@ -1,9 +1,15 @@ #ifndef REV2_H #define REV2_H +<<<<<<< HEAD +#include "../lets_split.h" + +//void promicro_bootloader_jmp(bool program); +======= #include "quantum.h" void promicro_bootloader_jmp(bool program); +>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df #define KEYMAP( \ k00, k01, k02, k03, k04, k05, k45, k44, k43, k42, k41, k40, \ |