Skip to content

chore(ledger): record PR #2091 merge-conflict resolution #2092

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BigSimmo merged 2 commits into from
Aug 18, 2026
+1 −0
Merged

chore(ledger): record PR #2091 merge-conflict resolution #2092

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ca6ef6c
chore(ledger): record PR #2091 merge-conflict resolution
claude Aug 18, 2026
fdadc04
Merge branch 'main' into claude/pr-2040-merge-conflicts-pw1ysx
BigSimmo Aug 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ...ords/85adbcb388f97e5cacd515137c05989fedfe4423caca99867b727f7a0011a965.record.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
| 2026-08-18 | claude/patient-factsheets-search-regression-8iyvnd | 3cae468dbdcce99a686da84443ec8be2fae8e80c | src/components/factsheets/factsheets-home-page.tsx merge-conflict resolution | resolved: kept PR's ModeHomeTemplate rewrite over main's now-superseded card restyle (PR #2060); verified removed exports (featuredFactsheets/categoryCount/factsheetCategoryGlyph) unused elsewhere | merge-tree clean after resolution; grep verified no dangling references |
Loading