Conflicts resolved: state.rs keeps both the sweep fields (miner-eff) and the race fields (miner-perf); bench-log.md
keeps both appended entries; publish-manifest.sh keeps master's --override implementation (
|
||
|---|---|---|
| .. | ||
| cloud-devnet.md | ||
| cutover-2026-10-04.md | ||
| difficulty-v2-rollout-devnet.md | ||
| finality-v3-rollout-devnet.md | ||
| funding.md | ||
| miner-eff.md | ||
| miner-perf.md | ||
| morning-2026-10-04.md | ||
| node-changes.md | ||
| proving-v0.md | ||
| public-repo.md | ||
| seed-nodes.md | ||
| shard-test-pc2.md | ||