This is an automated cherry-pick of pingcap#6755

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
ti-chi-bot · Jul 29, 2021 · e026f48 · e026f48
1 parent 61fd746
commit e026f48
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/ticdc/ticdc-open-protocol.md b/ticdc/ticdc-open-protocol.md
@@ -275,8 +275,13 @@ COMMIT;
 
 目前 TiCDC 没有提供 Open Protocol 协议解析的标准实现，但是提供了 Golang 版本和 Java 版本的解析 demo。用户可以参考本文档提供的数据格式和以下 demo 实现消费端协议解析。
 
+<<<<<<< HEAD
 - [Golang demo](https://github.com/pingcap/ticdc/tree/release-5.0/kafka_consumer)
 - [Java demo](https://github.com/pingcap/ticdc/tree/release-5.0/demo/java)
+=======
+- [Golang demo](https://github.com/pingcap/ticdc/tree/master/cmd/kafka-consumer)
+- [Java demo](https://github.com/pingcap/ticdc/tree/master/demo/java)
+>>>>>>> 5e86e476d (update golang demo link (#6755))
 
 ## Column 的类型码