Skip to content

Conversation

tshepang
Copy link
Member

An upstream change resulted in a conflict,
due to rust-lang/rust#125166.

An upstream change resulted in a conflict,
due to rust-lang/rust#125166.
Copy link
Contributor

@pietroalbini pietroalbini left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bors merge

@bors-ferrocene
Copy link
Contributor

🕐 Waiting for PR status (Github check) to be set, probably by CI. Bors will automatically try to run when all required PR statuses are set.

@bors-ferrocene
Copy link
Contributor

Build succeeded:

  • full

@bors-ferrocene bors-ferrocene bot merged commit 6f132f8 into main May 21, 2024
@bors-ferrocene bors-ferrocene bot deleted the tshepang-avoid-submodule-conflict branch May 21, 2024 16:08
@github-actions github-actions bot added the backport:maybe PR candidate for backport label May 21, 2024
@pietroalbini pietroalbini removed the backport:maybe PR candidate for backport label Jul 8, 2024
ferrocene-automations bot pushed a commit that referenced this pull request Apr 23, 2025
Cleaned up tests by bringing objects under `mini_core` into scope
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants