Github user runyontr commented on the pull request:
https://github.com/apache/incubator-zeppelin/pull/752#issuecomment-193548418
Thank you all for the comments. I've noticed that now there is a note for
this pull request that this branch has conflicts that must be resolved. Would
you like me to re-merge in the current master branch from
apache/incubator-zeppelin, or will the approver of the pull request deal with
the merge conflicts that have come up from pulling new branches into master?
---
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.
---
