mirror of
https://github.com/storytold/designcraft.git
synced 2026-10-24 10:16:59 -06:00
Conflict: ROADMAP.md: both progress lines Conflict: docs/gaps.md: next's header, clipping paths added to its change list Conflict: docs/target-app-parity.md: next's header, clipping paths added to its change list Conflict: crates/doc/src/item.rs: both Graphic methods (next's shown_bounds, the branch's clip_region) Conflict: crates/idml/src/names.rs: both imports (ClippingKind, ContourType) Conflict: crates/idml/src/export.rs: both pushes, TextWrapPreference first, then the clipping settings Conflict: crates/idml/src/import.rs: both lets (next's wrap, the branch's clip) Conflict: crates/engine/src/cmd/file.rs: next's size and transform, plus clip: None Conflict: crates/engine/src/cmd/datamerge/fill.rs: next's Graphic with wrap, plus clip: None Conflict: crates/engine/src/cmd/mathexpr.rs: next's Graphic with wrap, plus clip: None Conflict: crates/pdf/src/tests.rs: both tests