mirror of
https://github.com/MBombeck/HealthLog.git
synced 2026-11-08 12:32:43 +00:00
Only CHANGELOG.md conflicted: v1.38.7 released while this branch was open, so the new release heading landed where the branch's [Unreleased] section sits. The HRV entries stay under [Unreleased] above 1.38.7; everything from 1.38.7 down is upstream's file verbatim. docs/api/openapi.yaml auto-merged. Upstream's only change there was the `info.version` bump to 1.38.7, which the merge took while keeping this branch's DashboardLayoutReadResult, and package.json now reads 1.38.7 to match — so the merged file should equal a fresh generate. It is a generated file, though, so confirm with `pnpm openapi:generate` rather than trusting the three-way merge.
2.3 MiB
2.3 MiB