Github user HyukjinKwon commented on the issue:
https://github.com/apache/spark/pull/7075
@josepablocam, it looks the conflicts were not resolved cleanly. Would you
resolve them?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
