Merge pull request #1022 from lucwastiaux/master

[qmk_firmware.git] / keyboards / lets_split / rev2 / rev2.h

diff --git a/keyboards/lets_split/rev2/rev2.h b/keyboards/lets_split/rev2/rev2.h
index 9e251ca57dbbfc69182acc2387104a6d81baf3ac..7c397912f59b141935bef78f1988b037e8168a5d 100644 (file)
--- a/keyboards/lets_split/rev2/rev2.h
+++ b/keyboards/lets_split/rev2/rev2.h
@@ -1,21 +1,18 @@
 #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, \
-       k10, k11, k12, k13, k14, k15, k55, k54, k53, k52, k51, k50, \
-       k20, k21, k22, k23, k24, k25, k65, k64, k63, k62, k61, k60, \
-       k30, k31, k32, k33, k34, k35, k75, k74, k73, k72, k71, k70 \
+       k00, k01, k02, k03, k04, k05, k40, k41, k42, k43, k44, k45, \
+       k10, k11, k12, k13, k14, k15, k50, k51, k52, k53, k54, k55, \
+       k20, k21, k22, k23, k24, k25, k60, k61, k62, k63, k64, k65, \
+       k30, k31, k32, k33, k34, k35, k70, k71, k72, k73, k74, k75 \
        ) \
        { \
                { k00, k01, k02, k03, k04, k05 }, \