mirror of
https://github.com/storytold/photocraft.git
synced 2026-11-21 09:26:43 +00:00
Resolve the conflicts by keeping both sides: the live reorder preview next to main's Content-Aware Move preview (canvas.rs), the Layers panel options dialog next to main's rasterize prompt (lib.rs), the thumbnail size test next to main's lock icon tests (layer_row_ui/tests.rs), and main's hu/tr/vi rows plus this PR's. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>