fix(handlers): resolve conflict markers in delegation_list_test.go #1023

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

1 Commits

Author SHA1 Message Date
7ce72d8260 fix(handlers): resolve conflict markers in delegation_list_test.go
Some checks failed
Block internal-flavored paths / Block forbidden paths (pull_request) Successful in 25s
Harness Replays / detect-changes (pull_request) Successful in 18s
Secret scan / Scan diff for credential-shaped strings (pull_request) Successful in 24s
E2E Staging Canvas (Playwright) / detect-changes (pull_request) Successful in 1m11s
qa-review / approved (pull_request) Failing after 30s
E2E API Smoke Test / detect-changes (pull_request) Successful in 1m31s
security-review / approved (pull_request) Failing after 28s
sop-checklist / na-declarations (pull_request) awaiting /sop-n/a declaration for: qa-review, security-review
sop-tier-check / tier-check (pull_request) Successful in 21s
gate-check-v3 / gate-check (pull_request) Failing after 49s
Handlers Postgres Integration / detect-changes (pull_request) Successful in 1m19s
sop-checklist / all-items-acked (pull_request) Successful in 25s
Runtime PR-Built Compatibility / detect-changes (pull_request) Successful in 1m5s
lint-required-no-paths / lint-required-no-paths (pull_request) Successful in 1m28s
Harness Replays / Harness Replays (pull_request) Successful in 5s
E2E Staging Canvas (Playwright) / Canvas tabs E2E (pull_request) Successful in 3s
Runtime PR-Built Compatibility / PR-built wheel + import smoke (pull_request) Successful in 2s
E2E API Smoke Test / E2E API Smoke Test (pull_request) Successful in 1m46s
Handlers Postgres Integration / Handlers Postgres Integration (pull_request) Failing after 3m37s
audit-force-merge / audit (pull_request) Has been skipped
Remove three residual conflict markers introduced by commit 126edf74:
- Line 148: stray ======= between TestListDelegationsFromLedger_MultipleRows
  and TestListDelegationsFromLedger_NullsOmitted (incoming change kept)
- Line 193: closing >>>>>>> 5531b471 marker (incoming change kept)
- Lines 486-492: orphan <<<<<<< HEAD marker + comment (function already removed)

File now compiles cleanly. Fixes Go CI failure on main.

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