fix(handlers): resolve truncated conflict marker in delegation_list_test.go #1014

Closed
core-be wants to merge 1 commits from fix/resolve-conflict-marker-delegation-list-test into main

1 Commits

Author SHA1 Message Date
b9ae165902 fix(handlers): resolve truncated conflict marker in delegation_list_test.go
Some checks failed
Block internal-flavored paths / Block forbidden paths (pull_request) Successful in 20s
Harness Replays / detect-changes (pull_request) Successful in 20s
Secret scan / Scan diff for credential-shaped strings (pull_request) Successful in 21s
CI / Detect changes (pull_request) Successful in 59s
E2E Staging Canvas (Playwright) / detect-changes (pull_request) Successful in 55s
E2E API Smoke Test / detect-changes (pull_request) Successful in 1m0s
Handlers Postgres Integration / detect-changes (pull_request) Successful in 56s
gate-check-v3 / gate-check (pull_request) Successful in 30s
qa-review / approved (pull_request) Failing after 24s
Runtime PR-Built Compatibility / detect-changes (pull_request) Successful in 51s
security-review / approved (pull_request) Failing after 20s
sop-checklist / na-declarations (pull_request) awaiting /sop-n/a declaration for: qa-review, security-review
sop-checklist / all-items-acked (pull_request) Successful in 22s
sop-tier-check / tier-check (pull_request) Successful in 20s
lint-required-no-paths / lint-required-no-paths (pull_request) Successful in 1m29s
Harness Replays / Harness Replays (pull_request) Successful in 6s
CI / Shellcheck (E2E scripts) (pull_request) Successful in 5s
CI / Canvas (Next.js) (pull_request) Successful in 6s
CI / Python Lint & Test (pull_request) Successful in 5s
E2E Staging Canvas (Playwright) / Canvas tabs E2E (pull_request) Successful in 10s
Runtime PR-Built Compatibility / PR-built wheel + import smoke (pull_request) Successful in 10s
Handlers Postgres Integration / Handlers Postgres Integration (pull_request) Failing after 1m19s
E2E API Smoke Test / E2E API Smoke Test (pull_request) Successful in 2m3s
CI / Platform (Go) (pull_request) Failing after 4m12s
CI / Canvas Deploy Reminder (pull_request) Successful in 4s
CI / all-required (pull_request) Successful in 5s
audit-force-merge / audit (pull_request) Has been skipped
Main had an open <<<<<<< HEAD at line 488 with no closer — file ended
mid-marker, causing Go compilation failure on main CI.

Resolves the truncated conflict by keeping the HEAD version (no-op removal
of the TestListDelegationsFromActivityLogs_ScanErrorSkipped comment block).

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
2026-05-14 13:25:07 +00:00