summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Brassel <nick@tzarc.org>2021-11-18 07:38:06 +1100
committerNick Brassel <nick@tzarc.org>2021-11-18 07:38:06 +1100
commit45f4f446fb8473008252756e45023fc11bfe1472 (patch)
tree5def968e04ecfff128ef853d61f24e7664dbc76f
parent9ec43882cbbf78ed51298ec0a29b77b7797a0348 (diff)
parent2c5d66987da4c7d5857cab8b09c4f852b4d8e4d9 (diff)
downloadqmk_firmware-45f4f446fb8473008252756e45023fc11bfe1472.tar.gz
qmk_firmware-45f4f446fb8473008252756e45023fc11bfe1472.zip
Merge remote-tracking branch 'upstream/master' into develop
-rw-r--r--keyboards/checkerboards/phoenix45_ortho/keymaps/via/rules.mk2
-rw-r--r--keyboards/sneakbox/ava/info.json2
2 files changed, 2 insertions, 2 deletions
diff --git a/keyboards/checkerboards/phoenix45_ortho/keymaps/via/rules.mk b/keyboards/checkerboards/phoenix45_ortho/keymaps/via/rules.mk
index 69de2e4c5a..1e5b99807c 100644
--- a/keyboards/checkerboards/phoenix45_ortho/keymaps/via/rules.mk
+++ b/keyboards/checkerboards/phoenix45_ortho/keymaps/via/rules.mk
@@ -1 +1 @@
-VIA_ENABLE = yes
+VIA_ENABLE = yes
diff --git a/keyboards/sneakbox/ava/info.json b/keyboards/sneakbox/ava/info.json
index 55b52a5c55..276efce018 100644
--- a/keyboards/sneakbox/ava/info.json
+++ b/keyboards/sneakbox/ava/info.json
@@ -1,4 +1,4 @@
-{
+{
"keyboard_name": "AVA",
"url": "https://sneakbox.com",
"maintainer": "mujimanic",