summaryrefslogtreecommitdiffstats
path: root/keyboards/lets_split/rev2/rev2.h
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/lets_split/rev2/rev2.h')
-rw-r--r--keyboards/lets_split/rev2/rev2.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/keyboards/lets_split/rev2/rev2.h b/keyboards/lets_split/rev2/rev2.h
index 9e251ca57d..990976de2b 100644
--- a/keyboards/lets_split/rev2/rev2.h
+++ b/keyboards/lets_split/rev2/rev2.h
@@ -1,15 +1,12 @@
#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
+//void promicro_bootloader_jmp(bool program);
#define KEYMAP( \
k00, k01, k02, k03, k04, k05, k45, k44, k43, k42, k41, k40, \