summaryrefslogtreecommitdiffstats
path: root/keyboards/lets_split/rev2/rev2.h
diff options
context:
space:
mode:
authorclimbalima <climbalima@gmail.com>2016-11-17 01:26:38 +0100
committerclimbalima <climbalima@gmail.com>2016-11-17 01:26:38 +0100
commit5cac51a773bef7fc8064390ac3ee499121a9611d (patch)
tree765b36006bb3d60f51dd0af27e89dac7bce2a59b /keyboards/lets_split/rev2/rev2.h
parent1dd6ceb45dfcf5f0991b84fea5a761a35df7fcda (diff)
parentbce6e52391da7c5f620c96a91857940f0dee19df (diff)
downloadqmk_firmware-5cac51a773bef7fc8064390ac3ee499121a9611d.tar.gz
qmk_firmware-5cac51a773bef7fc8064390ac3ee499121a9611d.tar.xz
Merge https://github.com/climbalima/qmk_firmware
Diffstat (limited to 'keyboards/lets_split/rev2/rev2.h')
-rw-r--r--keyboards/lets_split/rev2/rev2.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/keyboards/lets_split/rev2/rev2.h b/keyboards/lets_split/rev2/rev2.h
index a8b0f0f4c..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, \