Github user rxin commented on the pull request:
https://github.com/apache/spark/pull/7451#issuecomment-122375616
Oops there is another conflict. I tried resolving this locally but it was a
big one. Can you resolve it?
---
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]
