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

2016-11-16 19:26:38 -05:00
parent 1dd6ceb45d bce6e52391
commit 5cac51a773
14 changed files with 278 additions and 29 deletions
--- a/keyboards/lets_split/lets_split.c
+++ b/keyboards/lets_split/lets_split.c
@ -1,2 +1,6 @@
 #include "lets_split.h"

+<<<<<<< HEAD
+=======
+
+>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df