From 8d1a3b89c7c9749af8fc25693cffc69d4af6b5af Mon Sep 17 00:00:00 2001 From: imccyu <276526105+imccyu@users.noreply.github.com> Date: Mon, 27 Jul 2026 10:25:12 +0800 Subject: [PATCH] fix runtime README pairing record left with merge conflict markers The master merge committed the i18n.yaml with unresolved conflict hunks (carried over from the adapt branch's own master merge); re-recorded via verify-translation-pairing --write. 518 pairs consistent. --- packages/client/runtime/README.i18n.yaml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/packages/client/runtime/README.i18n.yaml b/packages/client/runtime/README.i18n.yaml index fbedbd07d4..3e687c64dd 100644 --- a/packages/client/runtime/README.i18n.yaml +++ b/packages/client/runtime/README.i18n.yaml @@ -2,10 +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 -<<<<<<< HEAD README.md: d80c4a13e3d1b0f1713a6788446ae24fe3550381 README.zh.md: 727721824790f33b99fc7c79d96420434cc3a1d0 -======= -README.md: 4724ebc75d441252245a0e811a4ae34f8b529a98 -README.zh.md: 6a0076742efccaf946910c77c77a9b74194b9dc5 ->>>>>>> origin/master