From 9f77128c969b65873bcc54cfa281c36d929b7ac4 Mon Sep 17 00:00:00 2001
From: Charly Delay <0xcharly@users.noreply.github.com>
Date: Tue, 26 Jul 2022 12:23:55 +0900
Subject: [PATCH 1/2] bastardkb: fix info.json changes that got reverted during
 the last merge from `master` to `develop`

---
 keyboards/bastardkb/scylla/info.json   | 6 +-----
 keyboards/bastardkb/skeletyl/info.json | 6 +-----
 keyboards/bastardkb/tbk/info.json      | 3 ---
 keyboards/bastardkb/tbkmini/info.json  | 6 +-----
 4 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/keyboards/bastardkb/scylla/info.json b/keyboards/bastardkb/scylla/info.json
index 1d3dd39030f4..02047a362e68 100644
--- a/keyboards/bastardkb/scylla/info.json
+++ b/keyboards/bastardkb/scylla/info.json
@@ -1,12 +1,8 @@
 {
     "keyboard_name": "Scylla",
-    "manufacturer": "Bastard Keyboards",
-    "url": "https://bastardkb.com/",
-    "maintainer": "Quentin Lebastard",
+    "url": "https://bastardkb.com/scylla",
     "usb": {
-        "vid": "0xA8F8",
         "pid": "0x1829",
-        "device_version": "0.0.1"
     },
     "layouts": {
         "LAYOUT_split_4x6_5": {
diff --git a/keyboards/bastardkb/skeletyl/info.json b/keyboards/bastardkb/skeletyl/info.json
index c06e23ba227f..1b2f8570092b 100644
--- a/keyboards/bastardkb/skeletyl/info.json
+++ b/keyboards/bastardkb/skeletyl/info.json
@@ -1,12 +1,8 @@
 {
     "keyboard_name": "Skeletyl",
-    "manufacturer": "Bastard Keyboards",
-    "url": "https://www.bastardkb.com",
-    "maintainer": "Quentin Lebastard",
+    "url": "https://www.bastardkb.com/skeletyl",
     "usb": {
-        "vid": "0xA8F8",
         "pid": "0x1830",
-        "device_version": "0.0.1"
     },
     "layouts": {
         "LAYOUT_split_3x5_3": {
diff --git a/keyboards/bastardkb/tbk/info.json b/keyboards/bastardkb/tbk/info.json
index d16014c48a81..d25ccd5cf64b 100644
--- a/keyboards/bastardkb/tbk/info.json
+++ b/keyboards/bastardkb/tbk/info.json
@@ -1,10 +1,7 @@
 {
     "keyboard_name": "The Bastard Keyboard",
-    "manufacturer": "Bastard Keyboards",
     "url": "https://bastardkb.com/",
-    "maintainer": "Quentin Lebastard",
     "usb": {
-        "vid": "0xA8F8",
         "pid": "0x1828",
         "device_version": "0.0.1"
     },
diff --git a/keyboards/bastardkb/tbkmini/info.json b/keyboards/bastardkb/tbkmini/info.json
index 549879328b67..925baf33c81e 100644
--- a/keyboards/bastardkb/tbkmini/info.json
+++ b/keyboards/bastardkb/tbkmini/info.json
@@ -1,12 +1,8 @@
 {
     "keyboard_name": "TBK Mini",
-    "manufacturer": "Bastard Keyboards",
-    "url": "https://www.bastardkb.com",
-    "maintainer": "Quentin Lebastard",
+    "url": "https://www.bastardkb.com/tbk-mini",
     "usb": {
-        "vid": "0xA8F8",
         "pid": "0x1828",
-        "device_version": "0.0.1"
     },
     "layouts": {
         "LAYOUT_split_3x6_3": {

From 71e97ac2281f86c45e1c23db5ade75093ebc1255 Mon Sep 17 00:00:00 2001
From: Charly Delay <0xcharly@users.noreply.github.com>
Date: Tue, 26 Jul 2022 14:09:55 +0900
Subject: [PATCH 2/2] Remove board name from root folder `info.json`

---
 keyboards/bastardkb/scylla/info.json   | 1 -
 keyboards/bastardkb/skeletyl/info.json | 1 -
 keyboards/bastardkb/tbkmini/info.json  | 1 -
 3 files changed, 3 deletions(-)

diff --git a/keyboards/bastardkb/scylla/info.json b/keyboards/bastardkb/scylla/info.json
index 02047a362e68..026b0f742eb6 100644
--- a/keyboards/bastardkb/scylla/info.json
+++ b/keyboards/bastardkb/scylla/info.json
@@ -1,5 +1,4 @@
 {
-    "keyboard_name": "Scylla",
     "url": "https://bastardkb.com/scylla",
     "usb": {
         "pid": "0x1829",
diff --git a/keyboards/bastardkb/skeletyl/info.json b/keyboards/bastardkb/skeletyl/info.json
index 1b2f8570092b..55f68dc9b2f7 100644
--- a/keyboards/bastardkb/skeletyl/info.json
+++ b/keyboards/bastardkb/skeletyl/info.json
@@ -1,5 +1,4 @@
 {
-    "keyboard_name": "Skeletyl",
     "url": "https://www.bastardkb.com/skeletyl",
     "usb": {
         "pid": "0x1830",
diff --git a/keyboards/bastardkb/tbkmini/info.json b/keyboards/bastardkb/tbkmini/info.json
index 925baf33c81e..4233599432af 100644
--- a/keyboards/bastardkb/tbkmini/info.json
+++ b/keyboards/bastardkb/tbkmini/info.json
@@ -1,5 +1,4 @@
 {
-    "keyboard_name": "TBK Mini",
     "url": "https://www.bastardkb.com/tbk-mini",
     "usb": {
         "pid": "0x1828",