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

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

1 Commits

Author SHA1 Message Date
608877b4a1 fix(handlers): resolve conflict markers in delegation_list_test.go
Some checks failed
Block internal-flavored paths / Block forbidden paths (pull_request) Successful in 17s
Harness Replays / detect-changes (pull_request) Successful in 15s
Secret scan / Scan diff for credential-shaped strings (pull_request) Successful in 17s
E2E Staging Canvas (Playwright) / detect-changes (pull_request) Successful in 1m1s
CI / Detect changes (pull_request) Successful in 1m2s
E2E API Smoke Test / detect-changes (pull_request) Successful in 1m2s
Handlers Postgres Integration / detect-changes (pull_request) Successful in 52s
Runtime PR-Built Compatibility / detect-changes (pull_request) Successful in 48s
sop-tier-check / tier-check (pull_request) Successful in 20s
security-review / approved (pull_request) Failing after 24s
gate-check-v3 / gate-check (pull_request) Successful in 33s
qa-review / approved (pull_request) Failing after 32s
lint-required-no-paths / lint-required-no-paths (pull_request) Successful in 1m28s
sop-checklist / na-declarations (pull_request) awaiting /sop-n/a declaration for: qa-review, security-review
sop-checklist / all-items-acked (pull_request) acked: 0/7 — missing: comprehensive-testing, local-postgres-e2e, staging-smoke, +4 — body-unfilled: comprehensive-testing, local-postgres-e2
Harness Replays / Harness Replays (pull_request) Successful in 12s
CI / Canvas (Next.js) (pull_request) Successful in 14s
E2E Staging Canvas (Playwright) / Canvas tabs E2E (pull_request) Successful in 16s
CI / Shellcheck (E2E scripts) (pull_request) Successful in 8s
Runtime PR-Built Compatibility / PR-built wheel + import smoke (pull_request) Successful in 10s
CI / Python Lint & Test (pull_request) Successful in 11s
E2E API Smoke Test / E2E API Smoke Test (pull_request) Successful in 1m54s
Handlers Postgres Integration / Handlers Postgres Integration (pull_request) Successful in 5m32s
CI / Canvas Deploy Reminder (pull_request) Successful in 11s
CI / Platform (Go) (pull_request) Failing after 15m35s
audit-force-merge / audit (pull_request) Has been skipped
CI / all-required (pull_request) Successful in 5s
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 13:54:33 +00:00