Skip to content

Commit 3de9f8a

Browse files
Oreoxmtti-chi-bot
authored andcommitted
This is an automated cherry-pick of #3091
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
1 parent ef50f73 commit 3de9f8a

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

en/TOC.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@
124124
- [Log Collection](logs-collection.md)
125125
- [Monitoring and Alert on Kubernetes](monitor-kubernetes.md)
126126
- [PingCAP Clinic Diagnostic Data](clinic-data-collection.md)
127+
<<<<<<< HEAD
127128
- Release Notes
128129
- v1.3
129130
- [1.3.10](releases/release-1.3.10.md)
@@ -198,3 +199,5 @@
198199
- [0.2.1](releases/release-0.2.1.md)
199200
- [0.2.0](releases/release-0.2.0.md)
200201
- [0.1.0](releases/release-0.1.0.md)
202+
=======
203+
>>>>>>> 4bcf456e (remove release notes entry from TOC (#3091))

zh/TOC.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@
124124
- [日志收集](logs-collection.md)
125125
- [Kubernetes 监控与告警](monitor-kubernetes.md)
126126
- [PingCAP Clinic 数据采集范围说明](clinic-data-collection.md)
127+
<<<<<<< HEAD
127128
- 版本发布历史
128129
- v1.3
129130
- [1.3.10](releases/release-1.3.10.md)
@@ -198,3 +199,5 @@
198199
- [0.2.1](releases/release-0.2.1.md)
199200
- [0.2.0](releases/release-0.2.0.md)
200201
- [0.1.0](releases/release-0.1.0.md)
202+
=======
203+
>>>>>>> 4bcf456e (remove release notes entry from TOC (#3091))

0 commit comments

Comments
 (0)