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.

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

fix: redo rename of powerpc tramoline #2760

Merged
merged 1 commit into from
Dec 23, 2024

Conversation

ruben-arts
Copy link
Contributor

@ruben-arts ruben-arts commented Dec 23, 2024

This fixes a broken parallel merge of:

I renamed a file and @Hofer-Julian moved the, as he merged last it won without the rename. Sad 😞

Doing one more test to verify on conda-forge feedstock: conda-forge/pixi-feedstock#86

Copy link
Contributor

@Hofer-Julian Hofer-Julian left a comment

Choose a reason for hiding this comment

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

Thanks Ruben!

@ruben-arts ruben-arts merged commit 3f08cba into prefix-dev:main Dec 23, 2024
36 of 37 checks passed
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