From b047c1d592b025e8dff3588d5f2d236fcde1aea3 Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Tue, 14 Mar 2023 17:51:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/V20221214' into
 repo-square

---
 src/test.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test.txt b/src/test.txt
index feb8abd7..c367ce38 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-ide yangshi xiaotiaozheng
+Merge remote-tracking branch 'origin/V20221214' into repo-square