Github user bzz commented on the issue:
https://github.com/apache/zeppelin/pull/1044
RIght, in you fork you need to pull the master from apache git and then
rebase this branch on top of it, resolving the conflicts.
---
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.
---
