Skip to content

Commit 2de3ac6

Browse files
0xdevcollinsclaude
andcommitted
merge: resolve origin/production into main (#666)
Reconcile production (#664 hackathon track-based prizes + UI updates) with main. main already contains #664's substance (track-based prizes landed via the prize overhaul) plus the AI drafting, shared funding modal, treasury, and bounty reset-to-draft work, so the merge is a content no-op against main. Conflicts resolved by keeping main's versions (the AI/funding/treasury files that supersede production's pre-#665 base); removed the duplicate funding modals production carried under hackathons/new/ (canonical copies live in organization/funding/); kept main's generated schema.d.ts. Verified: tsc --noEmit and eslint both pass. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
2 parents 7f6857a + 40bff75 commit 2de3ac6

0 file changed

File tree

    0 commit comments

    Comments
     (0)