From f415322ac53240248764db0628cb164ff22db948 Mon Sep 17 00:00:00 2001 From: Gerrrt Date: Mon, 16 Nov 2026 09:54:57 +0000 Subject: [PATCH] docs(changelog): remove a stray merge marker left by #1524 A diff3 base marker, '||||||| 96c10c4c', was committed between two 2026-11-15 entries. Only the marker line goes; no entry text was lost or changed. Co-Authored-By: Claude Opus 5.5 --- docs/changelog.md | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/changelog.md b/docs/changelog.md index 0e6ec4ad..2152eb3e 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -193,7 +193,6 @@ docstring gives: it is a record, not a claim about now. that has not been made. The ยง9 commands run only under `bash`: in `zsh`, `$AUTH` reaches `curl` as one argument and is rejected before anything is sent. -||||||| 96c10c4c - **#1518 is deployed on `eden` and measured there.** This completes the 2026-11-15 entry *Container logs stop shipping the socket proxy's own