mirror of
https://github.com/storytold/vectorcraft.git
synced 2026-11-22 18:34:42 +01:00
Conflicts were 17 i18n .tsv files where both sides appended new strings; resolved as a union, verified to introduce no duplicate keys.
Conflicts were 17 i18n .tsv files where both sides appended new strings; resolved as a union, verified to introduce no duplicate keys.