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

Beautify conflicts.txt and update build.sh #32

Merged
merged 2 commits into from
May 2, 2017

Conversation

1Conan
Copy link
Collaborator

@1Conan 1Conan commented May 2, 2017

Finishes #23

@1Conan 1Conan requested a review from EthanRDoesMC May 2, 2017 09:13
@EthanRDoesMC EthanRDoesMC merged commit 55e0faa into master May 2, 2017
@1Conan 1Conan deleted the improve_conflicts_txt branch May 2, 2017 13:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants