mirror of
https://github.com/vitorpamplona/amethyst.git
synced 2026-10-05 19:28:25 +00:00
Two conflicts, both from both sides adding to the same generated or pinned artifact: - KindRegistryTest's list of renderable kinds that carry no `kind:` alias. main added 7516 (geocaching found logs), this branch added 30005 (video lists). Both are alias-less renderable kinds, so the resolution is the union. - material_symbols_outlined.ttf. main added FlashlightOff, FlashlightOn and PhotoLibrary; this branch added ClosedCaption and ClosedCaptionDisabled. The font is generated, so it was not resolved by hand: MaterialSymbols.kt merged cleanly with all five, and subset.sh regenerated from that. Verified all five plus the custom opentimestamps glyph are in the 247-codepoint result. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01JLEq2G6U29mKV8cfSTamZ9