mirror of
https://github.com/penpot/penpot.git
synced 2026-11-04 09:00:37 +00:00
9c6a2f498e
The resolve dialog called a property that both sides changed a clash, while the dialog itself speaks of conflicts. Use one word throughout: the tag reads Conflict, the count reads N conflicts, and the intro names the Conflict tag. Only the English copy changes; the message keys and the internal :clash source keep their names. AI-assisted-by: claude-opus-5-5