Merge remote-tracking branch 'upstream/master' into develop

2021-09-12 14:10:26 +10:00
parent d0ac03ec8b 4791cfae1a
commit 1895151a9c
1718 changed files with 191 additions and 4137 deletions
--- a/keyboards/melgeek/mj6xy/info.json
+++ b/keyboards/melgeek/mj6xy/info.json
@@ -2,8 +2,6 @@
    "keyboard_name": "MJ6XY",
    "url": "",
    "maintainer": "melgeek001365",
-    "width": 15,
-    "height": 5,
    "layouts": {
        "LAYOUT_60_ansi": {
            "layout": [
@@ -3456,4 +3454,3 @@
 		}
 	}
 }
-