diff options
| author | climbalima <climbalima@gmail.com> | 2016-11-17 01:26:38 +0100 |
|---|---|---|
| committer | climbalima <climbalima@gmail.com> | 2016-11-17 01:26:38 +0100 |
| commit | 5cac51a773bef7fc8064390ac3ee499121a9611d (patch) | |
| tree | 765b36006bb3d60f51dd0af27e89dac7bce2a59b /keyboards/lets_split/rev1/rev1.h | |
| parent | 1dd6ceb45dfcf5f0991b84fea5a761a35df7fcda (diff) | |
| parent | bce6e52391da7c5f620c96a91857940f0dee19df (diff) | |
| download | qmk_firmware-5cac51a773bef7fc8064390ac3ee499121a9611d.tar.gz qmk_firmware-5cac51a773bef7fc8064390ac3ee499121a9611d.tar.xz | |
Merge https://github.com/climbalima/qmk_firmware
Diffstat (limited to 'keyboards/lets_split/rev1/rev1.h')
| -rw-r--r-- | keyboards/lets_split/rev1/rev1.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/keyboards/lets_split/rev1/rev1.h b/keyboards/lets_split/rev1/rev1.h index 50bda0315..998b2be7c 100644 --- a/keyboards/lets_split/rev1/rev1.h +++ b/keyboards/lets_split/rev1/rev1.h @@ -1,9 +1,15 @@ #ifndef REV1_H #define REV1_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, k40, k41, k42, k43, k44, k45, \ |