Elgato_dark/zeppelin
1
0
Fork 0
mirror of https://github.com/apache/zeppelin synced 2026-05-24 09:38:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix merge error

Browse source
This commit is contained in:
sooyeon shin 2020-12-30 23:10:57 +09:00
parent 9f7ca99dc4
commit 316a454399
1 changed files with 0 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
docs/_config.yml
View file

@ -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
# The production_url is only used when full-domain names are needed
# such as sitemap.txt
@ -63,11 +59,7 @@ 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]