From da3fdb4428d1b3b1519852800f4fe4a971f82b1e Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Tue, 14 Mar 2023 17:52:43 +0800
Subject: [PATCH] =?UTF-8?q?Merge=20pull=20request=20'fix-2418=20=E8=AE=AD?=
 =?UTF-8?q?=E7=BB=83=E4=BB=BB=E5=8A=A1=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E7=94=A8=E6=88=B7=E5=8D=95=E7=9B=AE=E5=BD=95?=
 =?UTF-8?q?=E4=B8=8B=E6=9C=80=E5=A4=9A=E6=98=BE=E7=A4=BA=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E6=95=B0'=20(#2437)=20from=20fix-2418=20into=20V20220718?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/test.txt b/src/test.txt
index 9032e34a..7955955e 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-Merge branch 'V20220718' into phone
+Merge pull request 'fix-2418 训练任务详情页面提示用户单目录下最多显示文件数' (#2437) from fix-2418 into V20220718