move submodule entry to a place where it will not conflict#639
Merged
bors-ferrocene[bot] merged 1 commit intomainfrom May 21, 2024
Merged
move submodule entry to a place where it will not conflict#639bors-ferrocene[bot] merged 1 commit intomainfrom
bors-ferrocene[bot] merged 1 commit intomainfrom
Conversation
An upstream change resulted in a conflict, due to rust-lang/rust#125166.
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. |
Contributor
|
Build succeeded:
|
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
ferrocene-automations Bot
pushed a commit
that referenced
this pull request
Jan 30, 2026
remove repeated word
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
An upstream change resulted in a conflict,
due to rust-lang/rust#125166.