From: climbalima <climbalima@gmail.com>
Date: Fri, 11 Nov 2016 01:06:54 +0000 (-0500)
Subject: Merge branch 'master' of https://github.com/climbalima/qmk_firmware
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=ec0db2933cc2935a985087a4021f64f2422a3a46;p=qmk_firmware.git

Merge branch 'master' of https://github.com/climbalima/qmk_firmware

second try
---

ec0db2933cc2935a985087a4021f64f2422a3a46
diff --cc keyboards/lets_split/config.h
index 245529ae0,05439facb..a5394c5e4
--- a/keyboards/lets_split/config.h
+++ b/keyboards/lets_split/config.h
@@@ -25,9 -25,18 +25,21 @@@ along with this program.  If not, see <
  #define PRODUCT_ID      0x3060
  #define DEVICE_VER      0x0001
  #define MANUFACTURER    Wootpatoot
- #define PRODUCT         Lets Split v2
+ #define PRODUCT         Lets Split
  #define DESCRIPTION     A split keyboard for the cheap makers
  
++<<<<<<< HEAD
++=======
+ /* key matrix size */
+ // Rows are doubled-up
+ #define MATRIX_ROWS 8
+ #define MATRIX_COLS 6
+ 
+ // wiring of each half
+ #define MATRIX_ROW_PINS { B5, B4, E6, D7 }
+ #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 }
+ 
++>>>>>>> 79f82d3d80a24483d14b078d325bb0f45af58e3d
  #define CATERINA_BOOTLOADER
  
  // #define USE_I2C
@@@ -85,10 -94,5 +97,15 @@@
  //#define NO_ACTION_ONESHOT
  //#define NO_ACTION_MACRO
  //#define NO_ACTION_FUNCTION
++<<<<<<< HEAD
 +#ifdef SUBPROJECT_rev1
 +    #include "rev1/config.h"
 +#endif
 +#ifdef SUBPROJECT_rev2
 +    #include "rev2/config.h"
 +#endif
- #endif
++#endif
++=======
+ 
+ #endif
++>>>>>>> 79f82d3d80a24483d14b078d325bb0f45af58e3d