Merge remote-tracking branch 'origin/master' into web2-todo
# Conflicts: # packages/client/connection/src/client/fixture.ts # packages/client/runtime/README.i18n.yaml # packages/client/runtime/README.md # packages/client/runtime/README.zh.md # packages/client/runtime/src/client/index.ts # packages/client/runtime/src/client/sessions/session.ts # packages/client/ui-conversation/src/client/apply.ts # packages/client/ui-conversation/src/client/skeleton/ConversationRoot.tsx # packages/client/ui-conversation/tests/chat-stats-bash-sample.spec.tsx # packages/client/ui-conversation/tests/chat-toolview-slot.spec.tsx # packages/client/ui-conversation/tests/chat-view.spec.tsx # packages/client/ui-conversation/tests/gate-branch-tails.spec.tsx # packages/client/ui-conversation/tests/skeleton.spec.tsx # packages/client/ui-trajectory/tests/views.spec.tsx
This commit is contained in:
@@ -2,5 +2,10 @@
|
||||
# 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
|
||||
README.md: 9fcdc6539f680e35a38c104c6abde70334ac123d
|
||||
README.zh.md: c9fe9dedce4b56f7afa3b5a7f09fd45d62c4808e
|
||||
<<<<<<< HEAD
|
||||
README.md: d80c4a13e3d1b0f1713a6788446ae24fe3550381
|
||||
README.zh.md: 727721824790f33b99fc7c79d96420434cc3a1d0
|
||||
=======
|
||||
README.md: 4724ebc75d441252245a0e811a4ae34f8b529a98
|
||||
README.zh.md: 6a0076742efccaf946910c77c77a9b74194b9dc5
|
||||
>>>>>>> origin/master
|
||||
|
||||
Reference in New Issue
Block a user