Skip to content

fix Cargo.lock merge#7064

Merged
iliana merged 1 commit intomainfrom
iliana/relock
Nov 14, 2024
Merged

fix Cargo.lock merge#7064
iliana merged 1 commit intomainfrom
iliana/relock

Conversation

@iliana
Copy link
Contributor

@iliana iliana commented Nov 14, 2024

#7017 vs #7050 semantic merge conflict.

@iliana iliana enabled auto-merge (squash) November 14, 2024 03:17
@sunshowers
Copy link
Contributor

I've also included a fix in #7022 which I've queued for landing.

@iliana iliana merged commit 0318489 into main Nov 14, 2024
@iliana iliana deleted the iliana/relock branch November 14, 2024 05:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

Comments