From cccb055245cb6348cf306237ce60fa9ec0fd2fd1 Mon Sep 17 00:00:00 2001 From: damocles Date: Thu, 4 Jun 2026 12:05:04 +0200 Subject: [PATCH] docs: remove stale conflict marker from turn-loop.md --- docs/turn-loop.md | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/turn-loop.md b/docs/turn-loop.md index ee6e6640..929aefb8 100644 --- a/docs/turn-loop.md +++ b/docs/turn-loop.md @@ -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/.{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.