Commit bf658b6
fix: resolve backport merge conflicts in uv.lock
Mergify committed unresolved conflict markers when cherry-picking the
pyasn1 bump. Keep the release branch lock entries and re-sync uv.lock so
it is internally consistent with pyproject.toml.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_015FwHCHkuggaiyjB1fGhaBd
Signed-off-by: Charlie Doern <cdoern@redhat.com>1 parent 9ea4fb6 commit bf658b6
1 file changed
Lines changed: 4 additions & 36 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
0 commit comments