Merge branch 'codex/disable-telemetry-default' into master
Resolved conflicts: - packages/client/ui-settings-general/README.md, README.zh.md: kept PR opt-in telemetry description (DSH_TELEMETRY_MODE) - scripts/snapshots/translation-prompt-v4: kept master's newer README structure snapshot - i18n.yaml pairing records: resolved per file state - pnpm-lock.yaml: regenerated - Modify/delete conflicts (scaffold/telemetry, sdk-follow-up-capabilities): kept master deletions
This commit is contained in:
@@ -2,5 +2,5 @@
|
||||
# side as of the last confirmed-consistent state. Both languages carry equal authority;
|
||||
# after editing either side, bring the other along and re-record with:
|
||||
# pnpm run verify-translation-pairing --write docs/config-catalog.md
|
||||
config-catalog.md: 8bf8ffb31f87c019173cd45dbc7b804a98aaaa44
|
||||
config-catalog.zh.md: 28aa3cde7d213e35623491530b34cabfff1fcbcb
|
||||
config-catalog.md: 369490ec41480b8c46355f0edc3eb97f2f0c76cb
|
||||
config-catalog.zh.md: a735d7021d44dda3cffa49c31430249f70431720
|
||||
|
||||
Reference in New Issue
Block a user