summaryrefslogtreecommitdiff
path: root/keyboards/melgeek
diff options
context:
space:
mode:
authorfauxpark <fauxpark@gmail.com>2021-09-12 14:10:26 +1000
committerfauxpark <fauxpark@gmail.com>2021-09-12 14:10:26 +1000
commit1895151a9c71fb870cfc37233a7e89fe88379358 (patch)
tree1c936be1817c31639d7a3ba394a4081f620072c8 /keyboards/melgeek
parentd0ac03ec8b2af7334ac657dadcf0601d6f3469c0 (diff)
parent4791cfae1af0bc15a0bd8417c5195bf482b87605 (diff)
downloadqmk_firmware-1895151a9c71fb870cfc37233a7e89fe88379358.tar.gz
qmk_firmware-1895151a9c71fb870cfc37233a7e89fe88379358.zip
Merge remote-tracking branch 'upstream/master' into develop
Diffstat (limited to 'keyboards/melgeek')
-rw-r--r--keyboards/melgeek/mj61/info.json2
-rw-r--r--keyboards/melgeek/mj63/info.json2
-rw-r--r--keyboards/melgeek/mj64/info.json2
-rw-r--r--keyboards/melgeek/mj65/info.json2
-rwxr-xr-xkeyboards/melgeek/mj6xy/info.json3
-rwxr-xr-xkeyboards/melgeek/mojo68/info.json2
-rw-r--r--keyboards/melgeek/mojo75/info.json2
-rw-r--r--keyboards/melgeek/z70ultra/info.json2
8 files changed, 0 insertions, 17 deletions
diff --git a/keyboards/melgeek/mj61/info.json b/keyboards/melgeek/mj61/info.json
index 460858474c..52c98ecdab 100644
--- 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": [
diff --git a/keyboards/melgeek/mj63/info.json b/keyboards/melgeek/mj63/info.json
index f608b984e2..5c5983abd0 100644
--- 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": [
diff --git a/keyboards/melgeek/mj64/info.json b/keyboards/melgeek/mj64/info.json
index a9a8a5040b..61a7ded2a1 100644
--- 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": [
diff --git a/keyboards/melgeek/mj65/info.json b/keyboards/melgeek/mj65/info.json
index 7e11b6eb7e..e5fffa6d83 100644
--- 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": [
diff --git a/keyboards/melgeek/mj6xy/info.json b/keyboards/melgeek/mj6xy/info.json
index f0134582ff..712b97295c 100755
--- 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 @@
}
}
}
-
diff --git a/keyboards/melgeek/mojo68/info.json b/keyboards/melgeek/mojo68/info.json
index 01528250cc..843637d901 100755
--- 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": [
diff --git a/keyboards/melgeek/mojo75/info.json b/keyboards/melgeek/mojo75/info.json
index e9a90ea224..95f750b9f2 100644
--- 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": [
diff --git a/keyboards/melgeek/z70ultra/info.json b/keyboards/melgeek/z70ultra/info.json
index 9959e63849..e24b177070 100644
--- 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": [