aboutsummaryrefslogtreecommitdiff
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 460858474..52c98ecda 100644
--- a/keyboards/melgeek/mj61/info.json
+++ b/keyboards/melgeek/mj61/info.json
@@ -2,8 +2,6 @@
2 "keyboard_name": "MJ61", 2 "keyboard_name": "MJ61",
3 "url": "", 3 "url": "",
4 "maintainer": "melgeek001365", 4 "maintainer": "melgeek001365",
5 "width": 15,
6 "height": 5,
7 "layouts": { 5 "layouts": {
8 "LAYOUT_60_ansi": { 6 "LAYOUT_60_ansi": {
9 "layout": [ 7 "layout": [
diff --git a/keyboards/melgeek/mj63/info.json b/keyboards/melgeek/mj63/info.json
index f608b984e..5c5983abd 100644
--- a/keyboards/melgeek/mj63/info.json
+++ b/keyboards/melgeek/mj63/info.json
@@ -2,8 +2,6 @@
2 "keyboard_name": "MJ63", 2 "keyboard_name": "MJ63",
3 "url": "", 3 "url": "",
4 "maintainer": "melgeek001365", 4 "maintainer": "melgeek001365",
5 "width": 15,
6 "height": 5,
7 "layouts": { 5 "layouts": {
8 "LAYOUT_60_ansi_arrow": { 6 "LAYOUT_60_ansi_arrow": {
9 "layout": [ 7 "layout": [
diff --git a/keyboards/melgeek/mj64/info.json b/keyboards/melgeek/mj64/info.json
index a9a8a5040..61a7ded2a 100644
--- a/keyboards/melgeek/mj64/info.json
+++ b/keyboards/melgeek/mj64/info.json
@@ -2,8 +2,6 @@
2 "keyboard_name": "MJ64", 2 "keyboard_name": "MJ64",
3 "url": "", 3 "url": "",
4 "maintainer": "melgeek001365", 4 "maintainer": "melgeek001365",
5 "width": 15,
6 "height": 5,
7 "layouts": { 5 "layouts": {
8 "LAYOUT_64_ansi": { 6 "LAYOUT_64_ansi": {
9 "layout": [ 7 "layout": [
diff --git a/keyboards/melgeek/mj65/info.json b/keyboards/melgeek/mj65/info.json
index 7e11b6eb7..e5fffa6d8 100644
--- a/keyboards/melgeek/mj65/info.json
+++ b/keyboards/melgeek/mj65/info.json
@@ -2,8 +2,6 @@
2 "keyboard_name": "MJ65", 2 "keyboard_name": "MJ65",
3 "url": "", 3 "url": "",
4 "maintainer": "melgeek001365", 4 "maintainer": "melgeek001365",
5 "width": 16,
6 "height": 5,
7 "layouts": { 5 "layouts": {
8 "LAYOUT_65_ansi": { 6 "LAYOUT_65_ansi": {
9 "layout": [ 7 "layout": [
diff --git a/keyboards/melgeek/mj6xy/info.json b/keyboards/melgeek/mj6xy/info.json
index f0134582f..712b97295 100755
--- a/keyboards/melgeek/mj6xy/info.json
+++ b/keyboards/melgeek/mj6xy/info.json
@@ -2,8 +2,6 @@
2 "keyboard_name": "MJ6XY", 2 "keyboard_name": "MJ6XY",
3 "url": "", 3 "url": "",
4 "maintainer": "melgeek001365", 4 "maintainer": "melgeek001365",
5 "width": 15,
6 "height": 5,
7 "layouts": { 5 "layouts": {
8 "LAYOUT_60_ansi": { 6 "LAYOUT_60_ansi": {
9 "layout": [ 7 "layout": [
@@ -3456,4 +3454,3 @@
3456 } 3454 }
3457 } 3455 }
3458} 3456}
3459
diff --git a/keyboards/melgeek/mojo68/info.json b/keyboards/melgeek/mojo68/info.json
index 01528250c..843637d90 100755
--- a/keyboards/melgeek/mojo68/info.json
+++ b/keyboards/melgeek/mojo68/info.json
@@ -2,8 +2,6 @@
2 "keyboard_name": "MoJo68", 2 "keyboard_name": "MoJo68",
3 "url": "", 3 "url": "",
4 "maintainer": "melgeek001365", 4 "maintainer": "melgeek001365",
5 "width": 15,
6 "height": 5,
7 "layouts": { 5 "layouts": {
8 "LAYOUT_68_ansi": { 6 "LAYOUT_68_ansi": {
9 "layout": [ 7 "layout": [
diff --git a/keyboards/melgeek/mojo75/info.json b/keyboards/melgeek/mojo75/info.json
index e9a90ea22..95f750b9f 100644
--- a/keyboards/melgeek/mojo75/info.json
+++ b/keyboards/melgeek/mojo75/info.json
@@ -2,8 +2,6 @@
2 "keyboard_name": "MoJo75", 2 "keyboard_name": "MoJo75",
3 "url": "", 3 "url": "",
4 "maintainer": "melgeek001365", 4 "maintainer": "melgeek001365",
5 "width": 16,
6 "height": 6,
7 "layouts": { 5 "layouts": {
8 "LAYOUT_75_ansi": { 6 "LAYOUT_75_ansi": {
9 "layout": [ 7 "layout": [
diff --git a/keyboards/melgeek/z70ultra/info.json b/keyboards/melgeek/z70ultra/info.json
index 9959e6384..e24b17707 100644
--- a/keyboards/melgeek/z70ultra/info.json
+++ b/keyboards/melgeek/z70ultra/info.json
@@ -2,8 +2,6 @@
2 "keyboard_name": "Z70Ultra", 2 "keyboard_name": "Z70Ultra",
3 "url": "", 3 "url": "",
4 "maintainer": "melgeek001365", 4 "maintainer": "melgeek001365",
5 "width": 16,
6 "height": 5,
7 "layouts": { 5 "layouts": {
8 "LAYOUT_65_ansi_blocker": { 6 "LAYOUT_65_ansi_blocker": {
9 "layout": [ 7 "layout": [