This is an automated email from the ASF dual-hosted git repository.
huxing pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 5700e47 Fix admin-console page display extra git HEAD info (#216)
5700e47 is described below
commit 5700e477aafdeb8a4ee4c0ce06d9963a87a3797f
Author: Wei Sheng <[email protected]>
AuthorDate: Wed Dec 26 15:22:24 2018 +0800
Fix admin-console page display extra git HEAD info (#216)
---
docs/zh-cn/admin/install/admin-console.md | 4 ----
1 file changed, 4 deletions(-)
diff --git a/docs/zh-cn/admin/install/admin-console.md
b/docs/zh-cn/admin/install/admin-console.md
index 85a4426..f92fc9c 100644
--- a/docs/zh-cn/admin/install/admin-console.md
+++ b/docs/zh-cn/admin/install/admin-console.md
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
### 管理控制台安装
-=======
-###管理控制台安装
->>>>>>> a71d0fc87489096a2e99133c47769ffa750bafa6
目前版本的管理控制台正在开发中，已经完成了服务查询和服务治理的功能，采用前后端分离的模式，具体的安装和使用步骤如下：
