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/mj61/info.json
+++ b/keyboards/melgeek/mj61/info.json
@@ -2,8 +2,6 @@
    "keyboard_name": "MJ61",
    "url": "",
    "maintainer": "melgeek001365",
-    "width": 15,
-    "height": 5,
    "layouts": {
        "LAYOUT_60_ansi": {
            "layout": [
--- a/keyboards/melgeek/mj63/info.json
+++ b/keyboards/melgeek/mj63/info.json
@@ -2,8 +2,6 @@
    "keyboard_name": "MJ63",
    "url": "",
    "maintainer": "melgeek001365",
-    "width": 15,
-    "height": 5,
    "layouts": {
        "LAYOUT_60_ansi_arrow": {
            "layout": [
--- a/keyboards/melgeek/mj64/info.json
+++ b/keyboards/melgeek/mj64/info.json
@@ -2,8 +2,6 @@
    "keyboard_name": "MJ64",
    "url": "",
    "maintainer": "melgeek001365",
-    "width": 15,
-    "height": 5,
    "layouts": {
        "LAYOUT_64_ansi": {
            "layout": [
--- a/keyboards/melgeek/mj65/info.json
+++ b/keyboards/melgeek/mj65/info.json
@@ -2,8 +2,6 @@
    "keyboard_name": "MJ65",
    "url": "",
    "maintainer": "melgeek001365",
-    "width": 16,
-    "height": 5,
    "layouts": {
        "LAYOUT_65_ansi": {
            "layout": [
--- 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 @@
 		}
 	}
 }
-
--- a/keyboards/melgeek/mojo68/info.json
+++ b/keyboards/melgeek/mojo68/info.json
@@ -2,8 +2,6 @@
    "keyboard_name": "MoJo68",
    "url": "",
    "maintainer": "melgeek001365",
-    "width": 15,
-    "height": 5,
    "layouts": {
        "LAYOUT_68_ansi": {
 			"layout": [
--- a/keyboards/melgeek/mojo75/info.json
+++ b/keyboards/melgeek/mojo75/info.json
@@ -2,8 +2,6 @@
    "keyboard_name": "MoJo75",
    "url": "",
    "maintainer": "melgeek001365",
-    "width": 16,
-    "height": 6,
    "layouts": {
        "LAYOUT_75_ansi": {
            "layout": [
--- a/keyboards/melgeek/z70ultra/info.json
+++ b/keyboards/melgeek/z70ultra/info.json
@@ -2,8 +2,6 @@
    "keyboard_name": "Z70Ultra",
    "url": "",
    "maintainer": "melgeek001365",
-    "width": 16,
-    "height": 5,
    "layouts": {
        "LAYOUT_65_ansi_blocker": {
            "layout": [