Merge master into worktree/preset-user-root-in-package
Clean merge with no resolution edits: the branch is refreshed onto current master so the PR's mergeability is computed against a base it contains.
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: a778986b76985d10b7c7b69818ae24ef6dee9f04
|
||||
config-catalog.zh.md: 69e363679bf6d9fd97d508144e58612e45af8a5c
|
||||
config-catalog.md: e78b0cf389582c948961a29eeba3b15aeb366cbc
|
||||
config-catalog.zh.md: 938de99a0079fa09d3b5fc7c5dd6d41c88a110a8
|
||||
|
||||
Reference in New Issue
Block a user