diff options
author | climbalima <[email protected]> | 2016-11-16 19:49:38 -0500 |
---|---|---|
committer | climbalima <[email protected]> | 2016-11-16 19:49:38 -0500 |
commit | 21b6b4e6c4d6872164a13e8d31e3e0a9f146ea60 (patch) | |
tree | 4d51176d38e38de3aed6e69d45ce1f742be279ba /keyboards/lets_split/rev2/rev2.h | |
parent | 668c7397023ad5c9d338b2165699af453f84af0a (diff) | |
download | qmk_firmware-21b6b4e6c4d6872164a13e8d31e3e0a9f146ea60.tar.gz qmk_firmware-21b6b4e6c4d6872164a13e8d31e3e0a9f146ea60.zip |
should have fixed conflixed
Diffstat (limited to 'keyboards/lets_split/rev2/rev2.h')
-rw-r--r-- | keyboards/lets_split/rev2/rev2.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/keyboards/lets_split/rev2/rev2.h b/keyboards/lets_split/rev2/rev2.h index 9e251ca57d..990976de2b 100644 --- a/keyboards/lets_split/rev2/rev2.h +++ b/keyboards/lets_split/rev2/rev2.h @@ -1,15 +1,12 @@ #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 +//void promicro_bootloader_jmp(bool program); #define KEYMAP( \ k00, k01, k02, k03, k04, k05, k45, k44, k43, k42, k41, k40, \ |