From 844602117673c09dc6dc9c16fe666ea1a15bbdd2 Mon Sep 17 00:00:00 2001
From: chenyifan01 <cyf_uestc@outlook.com>
Date: Tue, 14 Mar 2023 17:50:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/V20230215' into fix-2417

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

diff --git a/src/test.txt b/src/test.txt
index 74d6e881..7ed6ee61 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-Merge pull request '修复相同类型，不同计算资源任务之间未共享限制的bug' (#3603) from fix-2417 into V20230215
+Merge remote-tracking branch 'origin/V20230215' into fix-2417