mirror of
https://github.com/usestrix/strix.git
synced 2026-08-19 18:13:34 +02:00
Both conflicts were additive collisions: an import block that gained a line on each side, and two test suites appending cases at the same point in the file.