From 8efb30e535d1103e2e5d52378999649c39bed252 Mon Sep 17 00:00:00 2001 From: Jake Gaylor Date: Thu, 10 Sep 2026 23:50:51 -0400 Subject: [PATCH] fix(docs): remove a stray conflict marker from the changelog A botched conflict resolution left `>>>>>>> theirs` in CHANGELOG.md. The file is not only repo furniture: `Fountain.Docs` declares it on its `extra_resources:` line and `docs/changelog.md` pulls it in as a snippet, so the marker is embedded at compile time and served to readers at /docs/changelog. The paragraph above it is intact and the bullet below it is the next entry, so the marker is vestigial and the line simply goes. Co-Authored-By: Claude Opus 5 Claude-Session: https://claude.ai/code/session_01S9jevFQT5MkF3rJUieeiHW --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 50088660d..e6dfbcf24 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -64,7 +64,6 @@ upgrade, is in `AgentUpdate["model"]` are `string | null` and optional. A client that assumed a string needs a null check. Nothing else on the wire changed shape. ->>>>>>> theirs - Environment `setup_timeout_seconds` (1–900, default 120) lets cold repository toolchain setup run within an explicit bound. It persists through API/spec