chore: resolve merge conflicts for v0.4.24

2024-12-31 19:24:03 +08:00
parent a04870a662 553a4622bf
commit 67d0999bc3
79 changed files with 11903 additions and 7543 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -208,7 +208,7 @@ git_issues.md

 .next/
 .tests/
-.issues/
+# .issues/
 .docs/
 .issues/
 .gitboss/
@@ -220,4 +220,8 @@ combine.sh
 combined_output.txt
 .local
 .scripts
-tree.md
+tree.md
+tree.md
+.scripts
+.local
+.do