docs: remove stale conflict marker from turn-loop.md

This commit is contained in:
damocles 2026-06-04 12:05:04 +02:00 committed by mara
commit cccb055245

View file

@ -368,7 +368,6 @@ it as a stdio child via `--mcp-config`. The hyperhive socket name is
the command runs asynchronously in a harness-managed tokio task. Stdout
and stderr stream to `harness/bash-tasks/<id>.{out,err}`. When the
task completes (or times out, or the process errors), the harness wakes
<<<<<<< HEAD
the agent with a summary body — handle on a future turn. Optional
`timeout_secs`: pass a value for a deadline, or omit for no timeout
(runs until natural exit). Requires the `execution` tool group.