From eea452f7ea5c778dcf9db1d5541cc03d86871dab Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 14 Mar 2023 17:50:53 +0800
Subject: [PATCH] Merge branch 'V20221228' into zouap

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

diff --git a/src/test.txt b/src/test.txt
index a0f4d248..083dbf85 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-Merge pull request '解决文件中出现以\r结尾的字符串问题。' (#3518) from zouap into V20221228
+Merge branch 'V20221228' into zouap