This is an automated email from the ASF dual-hosted git repository.
casion pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/linkis-website.git
The following commit(s) were added to refs/heads/dev by this push:
new 01f9968cd0 Conflict resolution (#652)
01f9968cd0 is described below
commit 01f9968cd01a74689e9bb94147889326d64bf73a
Author: binbincheng <[email protected]>
AuthorDate: Mon Jan 9 09:47:14 2023 +0800
Conflict resolution (#652)
---
.../current/deployment/deploy-quick.md | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git
a/i18n/zh-CN/docusaurus-plugin-content-docs/current/deployment/deploy-quick.md
b/i18n/zh-CN/docusaurus-plugin-content-docs/current/deployment/deploy-quick.md
index bf49d7dacf..2b34839779 100644
---
a/i18n/zh-CN/docusaurus-plugin-content-docs/current/deployment/deploy-quick.md
+++
b/i18n/zh-CN/docusaurus-plugin-content-docs/current/deployment/deploy-quick.md
@@ -156,11 +156,7 @@ SPARK_CONF_DIR=/appcom/config/spark-config
#### LDAP 登录配置（可选）
:::caution 注意
-<<<<<<< HEAD
-默认是使用静态用户和密码,静态用户即部署用户，静态密码会在执行部署是随机生成一个密码串，存储于`{LINKIS_HOME}/conf/linkis-mg-gateway.properties`(>=1.0.3版本)。
-=======
-默认是使用静态用户和密码,静态用户即部署用户，静态密码会在执行部署是随机生成一个密码串，存储于`${LINKIS_HOME}/conf/linkis-mg-gateway.properties`(>=1.0.3版本)
->>>>>>> origin/dev
+默认是使用静态用户和密码,静态用户即部署用户，静态密码会在执行部署是随机生成一个密码串，存储于`${LINKIS_HOME}/conf/linkis-mg-gateway.properties`(>=1.0.3版本)。
:::
@@ -377,11 +373,7 @@ nginx的日志文件在 `/var/log/nginx/access.log`
和`/var/log/nginx/error.log
### 4.4 登录管理台
浏览器登陆 `http://xx.xx.xx.xx:8188/#/login`
-<<<<<<< HEAD
用户名/密码在`{LINKIS_HOME}/conf/linkis-mg-gateway.properties`中查看。
-=======
-用户名/密码在`${LINKIS_HOME}/conf/linkis-mg-gateway.properties`中查看
-
```shell script
wds.linkis.admin.user= #用户
wds.linkis.admin.password= #密码
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
