diff options
| author | Zach White <skullydazed@gmail.com> | 2021-07-14 10:30:28 -0700 |
|---|---|---|
| committer | Zach White <skullydazed@gmail.com> | 2021-07-14 10:30:28 -0700 |
| commit | 44d322623eb875f6eb2e0a317c76af2d47f7a9dc (patch) | |
| tree | ab722bcc4cea4e4ed16f0a5dce0602fe1f2c63e5 /keyboards/mechlovin/infinity87 | |
| parent | 52cfc9259b58a3a11a244fbe35c49c7dd1a9cae0 (diff) | |
| parent | ffdfe3798bc7bd374991abe8f10494f2e73aedd5 (diff) | |
| download | qmk_firmware-44d322623eb875f6eb2e0a317c76af2d47f7a9dc.tar.gz qmk_firmware-44d322623eb875f6eb2e0a317c76af2d47f7a9dc.zip | |
Merge remote-tracking branch 'origin/master' into develop
Resolved Conflicts:
keyboards/checkerboards/nop60/info.json
Diffstat (limited to 'keyboards/mechlovin/infinity87')
| -rw-r--r-- | keyboards/mechlovin/infinity87/rev1/rogue87/info.json | 2 | ||||
| -rw-r--r-- | keyboards/mechlovin/infinity87/rev1/rouge87/info.json | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/keyboards/mechlovin/infinity87/rev1/rogue87/info.json b/keyboards/mechlovin/infinity87/rev1/rogue87/info.json index 3d541cfb79..4a8d73e9cf 100644 --- a/keyboards/mechlovin/infinity87/rev1/rogue87/info.json +++ b/keyboards/mechlovin/infinity87/rev1/rogue87/info.json @@ -5,7 +5,7 @@ "width": 18.25, "height": 6.25, "layouts": { - "LAYOUT": { + "LAYOUT_all": { "layout": [ {"label":"K00", "x":0, "y":0}, {"label":"K01", "x":2, "y":0}, diff --git a/keyboards/mechlovin/infinity87/rev1/rouge87/info.json b/keyboards/mechlovin/infinity87/rev1/rouge87/info.json index 8317e93512..fb5a01f6c6 100644 --- a/keyboards/mechlovin/infinity87/rev1/rouge87/info.json +++ b/keyboards/mechlovin/infinity87/rev1/rouge87/info.json @@ -5,7 +5,7 @@ "width": 18.25, "height": 6.25, "layouts": { - "LAYOUT": { + "LAYOUT_all": { "layout": [ {"label":"K00", "x":0, "y":0}, {"label":"K01", "x":2, "y":0}, |