merge: resolve conflicts with M5Max128 local changes

2026-05-21 01:11:44 +08:00
parent bebaa743ed
commit 80812128e2
4 changed files with 34 additions and 4 deletions
@@ -15,3 +15,4 @@ __pycache__/
 node_modules/
 *.log
 /tmp/
+*.log