summaryrefslogtreecommitdiffstats
path: root/keyboards/lets_split/rev1/rev1.h
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/lets_split/rev1/rev1.h')
-rw-r--r--keyboards/lets_split/rev1/rev1.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/keyboards/lets_split/rev1/rev1.h b/keyboards/lets_split/rev1/rev1.h
index 50bda03154..998b2be7c7 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, \