docs: remove stale conflict marker from turn-loop.md
This commit is contained in:
parent
e58ead4329
commit
cccb055245
1 changed files with 0 additions and 1 deletions
|
|
@ -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.
|
||||
|
|
|
|||
Loading…
Reference in a new issue