diff options
| author | climbalima <climbalima@users.noreply.github.com> | 2016-11-14 23:08:10 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-14 23:08:10 -0500 |
| commit | bce6e52391da7c5f620c96a91857940f0dee19df (patch) | |
| tree | b2c83c7718443b57f3ef993a9d03b24ee21bf611 /keyboards | |
| parent | dd22c787b8b417df109d2136c76ce496dd7b93e3 (diff) | |
| download | firmware-bce6e52391da7c5f620c96a91857940f0dee19df.tar.gz firmware-bce6e52391da7c5f620c96a91857940f0dee19df.tar.bz2 firmware-bce6e52391da7c5f620c96a91857940f0dee19df.zip | |
fixed conflict
Diffstat (limited to 'keyboards')
| -rw-r--r-- | keyboards/lets_split/config.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/keyboards/lets_split/config.h b/keyboards/lets_split/config.h index bf0473116..059d45b0c 100644 --- a/keyboards/lets_split/config.h +++ b/keyboards/lets_split/config.h @@ -28,8 +28,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #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 @@ -39,7 +37,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #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 |