summaryrefslogtreecommitdiff
path: root/keyboards/lets_split
diff options
context:
space:
mode:
authorclimbalima <climbalima@users.noreply.github.com>2016-11-14 23:08:10 -0500
committerGitHub <noreply@github.com>2016-11-14 23:08:10 -0500
commitbce6e52391da7c5f620c96a91857940f0dee19df (patch)
treeb2c83c7718443b57f3ef993a9d03b24ee21bf611 /keyboards/lets_split
parentdd22c787b8b417df109d2136c76ce496dd7b93e3 (diff)
fixed conflict
Diffstat (limited to 'keyboards/lets_split')
-rw-r--r--keyboards/lets_split/config.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/keyboards/lets_split/config.h b/keyboards/lets_split/config.h
index bf04731162..059d45b0c0 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