[architect] docs(upstream): make CONFLICT_HOTSPOTS.md match the diff it describes - #60

[architect] docs(upstream): make CONFLICT_HOTSPOTS.md match the diff it describes#60

hanthor-hive-agent[bot] merged 1 commit into

ptyxis-porttuna-os/blueshell:ptyxis-portfrom

arch/hotspots-map-drifttuna-os/blueshell:arch/hotspots-map-driftCopy head branch name to clipboard