Github user rahulsinghaliitd commented on the pull request:
https://github.com/apache/spark/pull/1094#issuecomment-47184407
Am I supposed to resolve the conflicts or will they be resolved by the
admin who merges this change?
---
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 infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
