Github user bzz commented on the pull request:
https://github.com/apache/incubator-zeppelin/pull/152#issuecomment-138790015
`This branch has conflicts that must be resolved` signifies that it is not
aligned with the latest master, you need to make sure both checks are green
here.
---
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.
---
