Merge https://github.com/climbalima/qmk_firmware

[qmk_firmware.git] / keyboards / lets_split / lets_split.c

diff --git a/keyboards/lets_split/lets_split.c b/keyboards/lets_split/lets_split.c
index 851299aa2b4652e3b06d2a5a6ab03a60b3403bc1..8bb33f9514b54fc139dca18f6505221cde1f92dc 100644 (file)
--- a/keyboards/lets_split/lets_split.c
+++ b/keyboards/lets_split/lets_split.c
@@ -1,2 +1,6 @@
 #include "lets_split.h"
 
+<<<<<<< HEAD
+=======
+
+>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df