Github user JoshRosen commented on the pull request:
https://github.com/apache/spark/pull/2077#issuecomment-55440393
The "didn't merge cleanly" here is a false-positive due to a bug in the
pull request builder; please ignore the spurious warning (I'll fix this in the
afternoon).
---
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]