drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

Merge https://github.com/climbalima/qmk_firmware

Browse source
This commit is contained in:
climbalima 2016-11-16 19:26:38 -05:00
commit 5cac51a773
14 changed files with 278 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

6
keyboards/lets_split/rev1/rev1.h
View file

@ -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, \