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.

Sign up for GitHub

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

Jump to bottom

Made join a conflict method to fix #174. #320

Closed
wants to merge 1 commit into from
Closed

Made join a conflict method to fix #174. #320

wants to merge 1 commit into from

Conversation

wbyoung
Copy link
Contributor

@wbyoung wbyoung commented Nov 9, 2014

This is one way that #174 could be fixed, making join a conflict method, but it would break compatibility.

@wbyoung wbyoung mentioned this pull request Nov 9, 2014
Open
@esamattis esamattis added this to the 3.0 milestone Dec 21, 2014
@stoeffel
Copy link
Collaborator

@wbyoung could you rebase?

@stoeffel
Copy link
Collaborator

Closed in 63b7403

@stoeffel stoeffel closed this Jan 16, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
3.0
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@wbyoung @stoeffel @esamattis