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

Merge conflicts in xrpc client which is causing build issues #40

Closed

shine17 opened this issue Dec 13, 2017 · 1 comment

Contributor

shine17 commented Dec 13, 2017

This file has merge conflicts in the xrpc master -
https://github.com/Nordstrom/xrpc/blob/master/src/main/java/com/nordstrom/xrpc/client/XUrl.java

In the imports , we have merge conflicts which causes build errors

Contributor

xjdr commented Dec 16, 2017

Addressed by 0256e21

xjdr closed this as completed

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