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 <noreply@anthropic.com> |
||
|---|---|---|
| .. | ||
| designcraft | ||
| designcraft-cli | ||
| designcraft-web | ||