diff options
| author | William Chang <william@factual.com> | 2019-05-09 21:16:06 -0700 |
|---|---|---|
| committer | William Chang <william@factual.com> | 2019-05-09 21:16:06 -0700 |
| commit | 4b2d3288d013b1a71ea25402224c4a8225a099e9 (patch) | |
| tree | b7f5dded777a950e63c4dd967260744336bfaa6b /keyboards/baguette | |
| parent | 57a6ea11df685d84a1ea07953e88f224ce2b24f7 (diff) | |
| parent | bce391a663d2848bff8ffffca0e4bad771bd3890 (diff) | |
resolved conflicts
Diffstat (limited to 'keyboards/baguette')
| -rw-r--r-- | keyboards/baguette/info.json | 2 | ||||
| -rw-r--r-- | keyboards/baguette/readme.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/keyboards/baguette/info.json b/keyboards/baguette/info.json index f3c9b308fb..2e845cdda5 100644 --- a/keyboards/baguette/info.json +++ b/keyboards/baguette/info.json @@ -123,7 +123,7 @@ {"label":";", "x":10.75, "y":2}, {"label":"'", "x":11.75, "y":2}, {"label":"ISO #", "x":12.75, "y":2}, - {"label":"Enter", "x":13.75, "y":2, "w":1.25, "h":2}, + {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"label":"ISO \\", "x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, diff --git a/keyboards/baguette/readme.md b/keyboards/baguette/readme.md index d211af16a5..e6188cc990 100644 --- a/keyboards/baguette/readme.md +++ b/keyboards/baguette/readme.md @@ -6,7 +6,7 @@ Baguette This is a custom keyboard with backlight inspired by France. Keyboard Maintainer: [Yiancar](http://yiancar-designs.com/) and on [github](https://github.com/yiancar) -Hardware Supported: ATMEGA 32u4 MCU with backlight support. +Hardware Supported: ATMEGA 32u4 MCU with backlight support. Hardware Availability: Closed group-buy please contact the runners (Tesletron and Enjoy) Make example for this keyboard (after setting up your build environment): |