Auto-merging crates/spt-daemon/src/attach.rs
Auto-merging crates/spt-daemon/src/lib.rs
Auto-merging crates/spt-daemon/src/servehost.rs
Auto-merging crates/spt-net/src/net/attach.rs
Auto-merging crates/spt-store/src/helperline.rs
Auto-merging crates/spt/src/api/delivery.rs
Auto-merging crates/spt/src/api/nowsignal.rs
Auto-merging crates/spt/src/cli.rs
Auto-merging crates/spt/src/rc.rs
CONFLICT (content): Merge conflict in crates/spt/src/rc.rs
Auto-merging crates/spt/src/serveverb.rs
Auto-merging docs-site/src/serving/attachments.md
CONFLICT (content): Merge conflict in docs-site/src/serving/attachments.md
Auto-merging docs-site/src/serving/overview.md
Auto-merging traceable-reqs.toml
Automatic merge failed; fix conflicts and then commit the result.