From 08860f5caee760d4e792ece5c71752036c085e9d Mon Sep 17 00:00:00 2001 From: adevwithpurpose Date: Tue, 18 Aug 2026 12:14:45 -0300 Subject: [PATCH] fix(docs): remove stray unresolved conflict marker in ENVIRONMENT.md A single orphaned "<<<<<<< HEAD" line (no matching =======/>>>>>>> pair) leaked into release/v3.8.50 via PR #10039's merge-conflict resolution during this session's serial-merge sweep. Repo-wide sweep confirms no other stray markers exist. Table structure verified intact before/after removal. --- docs/reference/ENVIRONMENT.md | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/reference/ENVIRONMENT.md b/docs/reference/ENVIRONMENT.md index f199e19fec..e54c54dca5 100644 --- a/docs/reference/ENVIRONMENT.md +++ b/docs/reference/ENVIRONMENT.md @@ -1520,7 +1520,6 @@ These settings were introduced after the previous environment-contract snapshot. | Variable | Default | Source File | Description | | --- | --- | --- | --- | | `OMNIROUTE_CHAT_ADMISSION_QUEUE_MS` | `2000` | `src/shared/middleware/chatBodyAdmission.ts` | Maximum wait for a heavyweight chat admission slot before a retryable `503`; a short bounded wait serializes agent bursts instead of an instant `503`. `0` restores immediate rejection. | -<<<<<<< HEAD | `OMNIROUTE_CHAT_ADMISSION_MAX_QUEUED_BYTES` | `4194304` (4 MB) | `src/shared/middleware/chatBodyAdmission.ts` | Queued-bytes budget for the admission wait: bounds total buffered body bytes parked process-wide so the wait cannot amplify the heap (#4380). Over-budget waits receive a retryable `503` immediately. | | `OMNIROUTE_CHAT_VIRTUAL_TTL_MS` | `60000` (60 s) | `src/shared/middleware/chatBodyAdmission.ts` | Deprecated no-op since #10110: per-session admission lanes were removed in favor of one process-wide budget. Accepted for configuration compatibility; ignored. | | `OMNIROUTE_CHAT_VIRTUAL_MAX_SESSIONS` | `64` | `src/shared/middleware/chatBodyAdmission.ts` | Deprecated no-op since #10110: per-session admission lanes were removed in favor of one process-wide budget. Accepted for configuration compatibility; ignored. |