mirror of
https://github.com/storytold/wordcraft.git
synced 2026-10-25 19:07:17 -06:00
The upstream moved 51 commits ahead: the conflict was in the progress documents and the contributors' file (both sides' entries are kept), and the code merged on its own.