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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove merge conflict data #1

Merged
merged 1 commit into from Jan 14, 2016

Conversation

Projects
None yet
2 participants
@javan
Contributor

javan commented Jan 13, 2016

Oops 馃榿

nathanbuchar added a commit that referenced this pull request Jan 14, 2016

@nathanbuchar nathanbuchar merged commit 0c30b6d into nathanbuchar:master Jan 14, 2016

@nathanbuchar

This comment has been minimized.

Owner

nathanbuchar commented Jan 14, 2016

Oh shoot! Thanks for catching this, I feel like such a fool!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment