mirror of
https://github.com/storytold/designcraft.git
synced 2026-10-14 19:27:07 -04:00
Resolve conflicts keeping both sides: doc gains both `cjk` and `datamerge` modules; file.open resolves data-merge sources and loads the document's fonts; DocState keeps preview_stash/preview_record and fonts. Co-Authored-By: Claude Opus 5.5 <[email protected]>