zjffdu commented on a change in pull request #4009:
URL: https://github.com/apache/zeppelin/pull/4009#discussion_r553704367
##########
File path: docs/_config.yml
##########
@@ -21,11 +21,7 @@ author :
twitter : ASF
feedburner : feedname
-<<<<<<< Updated upstream
-ZEPPELIN_VERSION : 0.9.0-SNAPSHOT
-=======
ZEPPELIN_VERSION : 0.10.0-SNAPSHOT
->>>>>>> Stashed changes
Review comment:
Thanks for fixing these conflicts as well
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
