Github user corneadoug commented on the pull request:
https://github.com/apache/incubator-zeppelin/pull/609#issuecomment-172403544
@felixcheung haha thanks, I mistook the CI error for the conflicts one :)
(especially since I saw other github notifications about documentation asking
for rebase)
Since some of the profile are green and its documentation, I'm merging it
---
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.
---
