This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-website.git
commit e12ec15c3f02b47fd1323c1f6f10453aed516309
Author: alec.zheng <aleczhen...@gmail.com>
AuthorDate: Tue May 26 17:44:44 2020 +0800
resolve confict for summer 2020
---
_data/navigation.yml | 6 ------
_pages/cn/home.md | 5 ++++-
_pages/home.md | 5 ++++-
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/_data/navigation.yml b/_data/navigation.yml
index 3e8a4d4..28fcc55 100755
--- a/_data/navigation.yml
+++ b/_data/navigation.yml
@@ -30,9 +30,6 @@ t:
- title: "Blogs"
url: /year-archive/
group: "year-archive"
- - title: "Summer 2020"
- url: /summer2020
- group: "summer2020"
- title: "Downloads"
url: /release/
group: "release"
@@ -224,9 +221,6 @@ t:
- title: "博文"
url: /cn/year-archive/
group: "year-archive"
- - title: "暑期2020"
- url: /cn/summer2020
- group: "summer2020"
- title: "下载"
url: /cn/release/
group: "release"
diff --git a/_pages/cn/home.md b/_pages/cn/home.md
index 045d164..5d74a36 100755
--- a/_pages/cn/home.md
+++ b/_pages/cn/home.md
@@ -22,7 +22,10 @@ intro:
<style>left_ul li{width:100%} </style>
<ul class='left_ul'>
<li>
- <a href='/cn/release/java-chassis-downloads/'>Apache ServiceComb
Java-Chassis 发布 2.0.2</a>
+ <a href='/cn/release/java-chassis-downloads/'>Apache ServiceComb 社区
暑假coding 2020 活动</a>
+ </li>
+ <li>
+ <a href='/cn/release/java-chassis-downloads/'>Apache ServiceComb
Java-Chassis 发布 2.0.1</a>
</li>
<li>
<a href='/cn/release/service-center-downloads/'>Apache ServiceComb
Service-Center 发布 1.3.0</a>
diff --git a/_pages/home.md b/_pages/home.md
index 34d8db0..b9e7c89 100755
--- a/_pages/home.md
+++ b/_pages/home.md
@@ -22,7 +22,10 @@ intro:
<style>left_ul li{width:100%} </style>
<ul class='left_ul'>
<li>
- <a href='/release/java-chassis-downloads/'>Apache ServiceComb Java-Chassis
Release Version 2.0.2</a>
+ <a href='/summer2020'>Apache ServiceComb Summer Code 2020</a>
+ </li>
+ <li>
+ <a href='/release/java-chassis-downloads/'>Apache ServiceComb Java-Chassis
Release Version 2.0.1</a>
</li>
<li>
<a href='/release/service-center-downloads/'>Apache ServiceComb
Service-Center Release Version 1.3.0</a>
