From 7fd545568f18fee863416d1a49aa35967113e7e0 Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Tue, 14 Mar 2023 17:51:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/V20221102' into fix-2959

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

diff --git a/src/test.txt b/src/test.txt
index cd9e4d78..0cf8a28f 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-fix issue 关于全屏查看日志
+Merge remote-tracking branch 'origin/V20221102' into fix-2959