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

Resolve merge conflicts of pull requests #226

Closed
dstenger opened this issue Sep 4, 2017 · 2 comments
Closed

Resolve merge conflicts of pull requests #226

dstenger opened this issue Sep 4, 2017 · 2 comments
Assignees
@keshavnangare

Comments

@dstenger
Copy link
Contributor

dstenger commented Sep 4, 2017 •
edited
Loading

For following pull requests conflicts must be resolved:
@dstenger
Copy link
Contributor Author

dstenger commented Sep 4, 2017

Conflicts of #211 and #225 were resolved by undoing merge of #222 (fix is included in #211).

@dstenger
Copy link
Contributor Author

dstenger commented Sep 5, 2017

All pull requests are merged.

@dstenger dstenger closed this as completed Sep 5, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@keshavnangare keshavnangare

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@dstenger @keshavnangare