mirror of
https://github.com/block/buzz.git
synced 2026-10-29 13:31:44 +00:00
Resolve conflicts in personaDialogState.ts, personaDialogState.test.mjs, and types.ts by taking origin/main's version (our branch made no changes to those files). sharing.rs and update.rs auto-merged cleanly — our P1-2 lock scope and P2 retain-result changes combined with main's #7126 description field additions without conflict. Co-authored-by: Will Pfleger <pfleger.will@gmail.com> Signed-off-by: Will Pfleger <pfleger.will@gmail.com>