X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=keyboards%2Flets_split%2Frev2%2Frev2.h;fp=keyboards%2Flets_split%2Frev2%2Frev2.h;h=9e251ca57dbbfc69182acc2387104a6d81baf3ac;hb=5cac51a773bef7fc8064390ac3ee499121a9611d;hp=a8b0f0f4c702a5bd70d5548b8664d04df0766eee;hpb=1dd6ceb45dfcf5f0991b84fea5a761a35df7fcda;p=qmk_firmware.git

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, \