mirror of
https://github.com/storytold/pdfcraft.git
synced 2026-11-10 04:12:00 +00:00
mtlcl410andClaude Opus 5.5
9ffb00f8fd
Conflicts, each where both sides added at the same place; both kept:
- crates/annot/src/tests.rs, crates/automation/tests/it/automation.rs and
crates/ui-egui/tests/it/comments.rs: this branch's pop-up tests and main's
new tests.
- crates/ui-egui/src/i18n/{ca,fi,ro,vi}.tsv: this branch's pop-up lines and
main's image-paste and Home lines. No key is added twice.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Pq7HyCfwzyRXj4VfQAVVdv