Skip to content

fix: remove merge conflict marker from readme#103

Merged
evan-goode merged 1 commit intounmojang:developfrom
chrissawyerfan4:patch-1
Feb 24, 2026
Merged

fix: remove merge conflict marker from readme#103
evan-goode merged 1 commit intounmojang:developfrom
chrissawyerfan4:patch-1

Conversation

@chrissawyerfan4
Copy link
Contributor

(Didn't see a git commit message style guide btw. Looking at past commits, I wasn't sure how to indicate this is a minor commit or whether this is in the "fix" or a "docs" category. Might be good to include in CONTRIBUTING.md if this is something you have a preference about!)

Signed-off-by: chrissawyerfan4
Copy link
Member

@evan-goode evan-goode left a comment

Choose a reason for hiding this comment

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

Thanks, thought I did that already! No strong preferences regarding commit messages, just anything other than "Update README.md"!

@evan-goode evan-goode merged commit 25a1191 into unmojang:develop Feb 24, 2026
7 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