From 92eb360572cbab460905287631cc6f9e6e42b3d3 Mon Sep 17 00:00:00 2001
From: chenyifan01 <cyf_uestc@outlook.com>
Date: Tue, 14 Mar 2023 17:52:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/V20220815' into
 res-manage

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

diff --git a/src/test.txt b/src/test.txt
index 1460b956..0ac9812a 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-Merge branch 'feature-youys' into ww
+Merge remote-tracking branch 'origin/V20220815' into res-manage