mirror of
https://github.com/storytold/vectorcraft.git
synced 2026-11-11 18:54:55 +00:00
Merges of main kept both sides of conflicting edits to the milestone table, so M3, M7, M10, M11 and M13 appeared two to four times, each copy with a different subset of later edits. Keep one row per milestone. For M3, M10, M11 and M13 the kept row already contains every statement in the removed copies. For M7 no copy held them all: the kept row gains the Hyphenation and Justification clause that only the second copy carried.