Coder/deepseek-harness
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into worktree-locale

Browse Source 
# Conflicts:
#	packages/client/ui-slots/src/index.ts
This commit is contained in:
imccyu
2026-07-30 01:53:28 +08:00
parent 622450192d 2a53806275
commit 606b6aa78c
100 changed files with 1438 additions and 560 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/client/locale/src/client/index.ts
View File

@@ -4,7 +4,7 @@
* preference row into the settings General section — the locale feature owns
* its own settings surface.
*/
/* eslint-disable @typescript-eslint/no-redundant-type-constituents --
/* oxlint-disable typescript/no-redundant-type-constituents --
* `keyof LocaleNamespaceMap & string` is the declare-merge key pattern (see
* ui-slots): in THIS unit the map holds only this package's own merges, but
* consumers merge more namespaces in and the intersection keeps them