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

Fixing broken merge #154

Merged
merged 2 commits into from
Oct 8, 2013
Merged

Fixing broken merge #154

merged 2 commits into from
Oct 8, 2013

Conversation

narkisr
Copy link
Contributor

@narkisr narkisr commented Oct 8, 2013

Hey,

It looks like a merge was committed with the conflict comments in place

Thanks

jfryman pushed a commit that referenced this pull request Oct 8, 2013
@jfryman jfryman merged commit 8989d56 into voxpupuli:master Oct 8, 2013
@jfryman
Copy link
Contributor

jfryman commented Oct 8, 2013

Bleg. Could have sworn those came out. Thanks.

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