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

Clean up remnants of a merge #7

Merged
merged 1 commit into from Jan 2, 2016

Conversation

Projects
None yet
2 participants
@xsawyerx
Contributor

xsawyerx commented Jan 2, 2016

This is either from a Git merge, Git rebase, or from applying a patch directly. Either way, the second line is clearly the right one.

(This PR is part of the PRC project.)

Clean up remnants of a merge:
This is either from a Git merge, Git rebase, or from applying a
patch directly. Either way, the second line is clearly the right
one.

guimard added a commit that referenced this pull request Jan 2, 2016

@guimard guimard merged commit e2e0352 into rs:master Jan 2, 2016

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