[zeppelin] 01/02: [minor] update doc

[zj...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

zjffdu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/zeppelin.git

commit 085f3f1181b121dd2853123b740ceb9c0afc6f94
Author: Jeff Zhang <zj...@apache.org>
AuthorDate: Thu Dec 24 22:48:07 2020 +0800

    [minor] update doc
---
 docs/_config.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/docs/_config.yml b/docs/_config.yml
index d436f8b..4737696 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -21,7 +21,11 @@ author :
   twitter : ASF
   feedburner : feedname
 
+<<<<<<< Updated upstream
 ZEPPELIN_VERSION : 0.9.0-SNAPSHOT
+=======
+ZEPPELIN_VERSION : 0.10.0-SNAPSHOT
+>>>>>>> Stashed changes
 
 # The production_url is only used when full-domain names are needed
 # such as sitemap.txt
@@ -59,7 +63,11 @@ JB :
   #   - Only the following values are falsy: ["", null, false]
   #   - When setting BASE_PATH it must be a valid url.
   #     This means always setting the protocol (http|https) or prefixing with "/"
+<<<<<<< Updated upstream
   BASE_PATH : /docs/0.9.0-SNAPSHOT
+=======
+  BASE_PATH : /docs/0.10.0-SNAPSHOT
+>>>>>>> Stashed changes
 
   # By default, the asset_path is automatically defined relative to BASE_PATH plus the enabled theme.
   # ex: [BASE_PATH]/assets/themes/[THEME-NAME]