thanks for the contribution#105
Open
RealAntEngineer wants to merge 21 commits intoRealAntEngineer:1.20.1-devfrom
Open
thanks for the contribution#105RealAntEngineer wants to merge 21 commits intoRealAntEngineer:1.20.1-devfrom
RealAntEngineer wants to merge 21 commits intoRealAntEngineer:1.20.1-devfrom
Conversation
updating the README.md
Fix for broken merge, now merged in default branch
|
|
Owner
Author
|
@PaperTarsier692 I don't have the perm to solve the confict can you do it ? |
|
I don't really think my changes are worth merging as I stopped working on this and am not finished, feel free to use my changes, but I wouldn't use any of them. |
Owner
Author
|
I can't use them if you don't resolve the conflict. Please do it |
|
I can't resolve them either, you can always just copy paste tho |
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
3 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.
No description provided.