aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-09-26 04:54:31 +0000
committerQMK Bot <hello@qmk.fm>2021-09-26 04:54:31 +0000
commitc576b1100888ef4522ce73c451a0a7c2108b8adf (patch)
treebe266d8b63398c6b62b0507d57312c3ac10bdc12
parent3b9a4010362855152365ff52e1ac364f5d49b3ef (diff)
parent8c76e1ec08390316127f9eeb076033a0e1ecf8b3 (diff)
downloadqmk_firmware-c576b1100888ef4522ce73c451a0a7c2108b8adf.tar.gz
qmk_firmware-c576b1100888ef4522ce73c451a0a7c2108b8adf.zip
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--keyboards/flx/virgo/config.h3
-rw-r--r--keyboards/flx/virgo/info.json3
2 files changed, 1 insertions, 5 deletions
diff --git a/keyboards/flx/virgo/config.h b/keyboards/flx/virgo/config.h
index cd1a8d7b0..8ceb1e4ed 100644
--- a/keyboards/flx/virgo/config.h
+++ b/keyboards/flx/virgo/config.h
@@ -70,6 +70,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
70 #define RGBLIGHT_EFFECT_RGB_TEST 70 #define RGBLIGHT_EFFECT_RGB_TEST
71 #define RGBLIGHT_EFFECT_ALTERNATING 71 #define RGBLIGHT_EFFECT_ALTERNATING
72#endif 72#endif
73
74// generated by KBFirmware JSON to QMK Parser
75// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/flx/virgo/info.json b/keyboards/flx/virgo/info.json
index 435854aa5..5184e4fb1 100644
--- a/keyboards/flx/virgo/info.json
+++ b/keyboards/flx/virgo/info.json
@@ -1,7 +1,7 @@
1{ 1{
2 "keyboard_name": "FLX Virgo", 2 "keyboard_name": "FLX Virgo",
3 "url": "", 3 "url": "",
4 "maintainer": "qmk", 4 "maintainer": "mechmerlin",
5 "layouts": { 5 "layouts": {
6 "LAYOUT": { 6 "LAYOUT": {
7 "layout": [ 7 "layout": [
@@ -99,5 +99,4 @@
99 ] 99 ]
100 } 100 }
101 } 101 }
102 ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
103} 102}