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

Internal Change: Minion craft helper NEUInternalName #619

Merged

Conversation

walkerselby
Copy link
Contributor

No description provided.

@hannibal002 hannibal002 added this to the Version 0.21 milestone Oct 25, 2023
@hannibal002 hannibal002 added Soon This Pull Request will be merged within the next couple of betas and removed Soon This Pull Request will be merged within the next couple of betas labels Nov 28, 2023
@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Dec 2, 2023
Copy link

github-actions bot commented Dec 2, 2023

This pull request has conflicts with the base branch "beta". Please resolve those so we can test out your changes.

# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/features/bingo/MinionCraftHelper.kt
Copy link

github-actions bot commented Dec 2, 2023

Conflicts have been resolved! 🎉

@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Dec 2, 2023
Copy link

github-actions bot commented Dec 3, 2023

This pull request has conflicts with the base branch "beta". Please resolve those so we can test out your changes.

@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Dec 3, 2023
# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/features/bingo/MinionCraftHelper.kt
#	src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Dec 3, 2023
Copy link

github-actions bot commented Dec 3, 2023

Conflicts have been resolved! 🎉

@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Dec 8, 2023
Copy link

github-actions bot commented Dec 8, 2023

This pull request has conflicts with the base branch "beta". Please resolve those so we can test out your changes.

…-neuinternalname

# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/features/bingo/MinionCraftHelper.kt
Copy link

github-actions bot commented Dec 8, 2023

Conflicts have been resolved! 🎉

@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Dec 8, 2023
@hannibal002 hannibal002 added the Soon This Pull Request will be merged within the next couple of betas label Dec 9, 2023
@hannibal002 hannibal002 self-requested a review December 9, 2023 21:24
@hannibal002 hannibal002 merged commit af7f092 into hannibal002:beta Dec 9, 2023
2 checks passed
@github-actions github-actions bot removed the Soon This Pull Request will be merged within the next couple of betas label Dec 9, 2023
@walkerselby walkerselby deleted the minion-craft-helper-neuinternalname branch December 10, 2023 06:12
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