mirror of
https://github.com/storytold/photocraft.git
synced 2026-10-27 17:51:59 +01:00
- crates/ui-egui/src/layer_style.rs: values_of keeps the PR's method/smoothness keys and source-stop ends, and main's (#7072) unconditional From/To and geometry fields. - crates/compose/src/cmyk_tests.rs (no textual conflict): add the PR's new `interpolation: None` field to main's CMYK test GradientOverlay literal. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>