aboutsummaryrefslogtreecommitdiffstats
path: root/keyboards/gergo/info.json
diff options
context:
space:
mode:
authorGravatar William Chang <william@factual.com>2019-05-09 21:16:06 -0700
committerGravatar William Chang <william@factual.com>2019-05-09 21:16:06 -0700
commit4b2d3288d013b1a71ea25402224c4a8225a099e9 (patch)
treeb7f5dded777a950e63c4dd967260744336bfaa6b /keyboards/gergo/info.json
parent57a6ea11df685d84a1ea07953e88f224ce2b24f7 (diff)
parentbce391a663d2848bff8ffffca0e4bad771bd3890 (diff)
downloadqmk_firmware-4b2d3288d013b1a71ea25402224c4a8225a099e9.tar.gz
resolved conflicts
Diffstat (limited to 'keyboards/gergo/info.json')
-rw-r--r--keyboards/gergo/info.json42
1 files changed, 21 insertions, 21 deletions
diff --git a/keyboards/gergo/info.json b/keyboards/gergo/info.json
index cacbda423..586b9c908 100644
--- a/keyboards/gergo/info.json
+++ b/keyboards/gergo/info.json
@@ -5,7 +5,7 @@
"keyboard_name": "Gergo",
"url": "http://gboards.ca",
"layouts": {
- "LAYOUT_GERGO": {
+ "LAYOUT_gergo": {
"layout": [
{
"label": "L00",
@@ -181,6 +181,16 @@
"y": 1.75
},
{
+ "label": "L30",
+ "x": 8.25,
+ "y": 2.75
+ },
+ {
+ "label": "R30",
+ "x": 10.25,
+ "y": 2.75
+ },
+ {
"h": 1.5,
"label": "R20",
"x": 12,
@@ -228,26 +238,6 @@
"y": 3.63
},
{
- "label": "R33",
- "x": 12.5,
- "y": 3.63
- },
- {
- "label": "R34",
- "x": 13.75,
- "y": 3.25
- },
- {
- "label": "L30",
- "x": 8.25,
- "y": 2.75
- },
- {
- "label": "R30",
- "x": 10.25,
- "y": 2.75
- },
- {
"h": 2,
"label": "L33",
"x": 7.25,
@@ -270,6 +260,16 @@
"label": "R32",
"x": 11.25,
"y": 3.75
+ },
+ {
+ "label": "R33",
+ "x": 12.5,
+ "y": 3.63
+ },
+ {
+ "label": "R34",
+ "x": 13.75,
+ "y": 3.25
}
]
}