Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix auto merge conflict 2612 #2613

Closed
wants to merge 2 commits into from
Closed

Fix auto merge conflict 2612 #2613

wants to merge 2 commits into from

Conversation

hyperbolic2346
Copy link
Collaborator

@hyperbolic2346 hyperbolic2346 commented Nov 20, 2024 •
edited
Loading

PR #2612 failed due to Server error after all tests passed. This PR merges those changes.

@hyperbolic2346 hyperbolic2346 added the dependencies Pull requests that update a dependency file label Nov 20, 2024
@hyperbolic2346 hyperbolic2346 self-assigned this Nov 20, 2024
@hyperbolic2346 hyperbolic2346 requested a review from jlowe November 20, 2024 18:53
jlowe
jlowe reviewed Nov 20, 2024
View reviewed changes
Copy link
Member

@jlowe jlowe left a comment

Choose a reason for hiding this comment

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

Looks like #2612 has now merged after a subsequent sync job run, so it looks like we don't need this.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jlowe jlowe jlowe left review comments

Assignees

@hyperbolic2346 hyperbolic2346

Labels
dependencies Pull requests that update a dependency file
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@hyperbolic2346 @jlowe @nvauto