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

2016-11-16 19:26:38 -05:00
parent 1dd6ceb45d bce6e52391
commit 5cac51a773
14 changed files with 278 additions and 29 deletions
--- 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, \