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

Resolving conflicts and fixing a bad merge. #1311

Merged
merged 1 commit into from Nov 16, 2016

Conversation

Projects
None yet
1 participant
@miguelbalparda
Contributor

miguelbalparda commented Nov 16, 2016

No description provided.

@miguelbalparda miguelbalparda merged commit f091a08 into master Nov 16, 2016

3 checks passed

Scrutinizer No new issues
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment