Merge remote-tracking branch 'origin/main' into main

# Conflicts: # macro_pad_apps/example.json
2022-05-07 19:12:34 -04:00
parent f627501436 fac86aa3bf
commit b574da1e88
1 changed files with 1 additions and 6 deletions
@@ -4,10 +4,7 @@
    "k2":["TWO"],
    "k3":["THREE"],
    "k4":["ONE"],
-    "k5":{
-    "keys":["TWO"],
-    "name":""
-    }
+    "k5":["TWO"],
    "k6":["THREE"],
    "k7":["ONE"],
    "k8":["TWO"],
@@ -16,5 +13,3 @@
    "k11":["TWO"],
    "k12":["THREE"],
 }
-
-example.k1.name