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

Can not resolve conflicts #30

Open
stefanbuck opened this issue Jun 12, 2015 · 0 comments
Open

Can not resolve conflicts #30

stefanbuck opened this issue Jun 12, 2015 · 0 comments
Milestone

Comments

@stefanbuck
Copy link
Member

conflict

@ruyadorno ruyadorno added this to the v1.0.0-beta.1 milestone Jun 13, 2015
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

No branches or pull requests

2 participants