projects
/
qmk_firmware.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
dd22c78
)
fixed conflict
author
climbalima
<climbalima@users.noreply.github.com>
Tue, 15 Nov 2016 04:08:10 +0000
(23:08 -0500)
committer
GitHub
<noreply@github.com>
Tue, 15 Nov 2016 04:08:10 +0000
(23:08 -0500)
keyboards/lets_split/config.h
patch
|
blob
|
history
diff --git
a/keyboards/lets_split/config.h
b/keyboards/lets_split/config.h
index bf04731162ad906711739910406a36d02ddcfa61..059d45b0c00c84b1e00103530017ccb278ab141e 100644
(file)
--- 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