resolve conflicts

2026-05-09 12:59:18 +08:00 · 2026-04-21 17:19:48 +08:00 · 2026-04-21 17:19:48 +08:00 · b59d8d3446
commit b59d8d3446
parent 87bbcc4e3b
2 changed files with 1 additions and 8265 deletions
--- a/eslint-suppressions.json
+++ b/eslint-suppressions.json
@ -996,7 +996,7 @@
      "count": 2
    },
    "ts/no-explicit-any": {
-      "count": 17
+      "count": 20
    }
  },
  "web/app/components/base/chat/chat/index.tsx": {
--- a/web/eslint-suppressions.json
+++ b/web/eslint-suppressions.json