Skip to content

Commit 3743425

Browse files
authored
chore: fix broken lockfile (#5662)
Merging a bunch of dependabot PRs in succession without rebasing them in between caused some broken state in `Cargo.lock` (sometimes even if things can be automatically merged using git algorithms without merge conflicts, it doesn't mean that the result of the merge is going to be semantically correct — which is why merge queues exist and we should be using them). This commit fixes the broken lockfile.
1 parent d628e00 commit 3743425

1 file changed

Lines changed: 2 additions & 8 deletions

File tree

Cargo.lock

Lines changed: 2 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)