From 063bb65254bb39719367320a98ad3c1986d20e40 Mon Sep 17 00:00:00 2001
From: zhoupzh <zhoupzh@pcl.ac.cn>
Date: Tue, 14 Mar 2023 17:52:24 +0800
Subject: [PATCH] =?UTF-8?q?Merge=20pull=20request=20'fix-1940=20(=E8=BF=98?=
 =?UTF-8?q?=E5=8E=9F=E4=BF=AE=E6=94=B9)=20=E4=B8=8A=E4=BC=A0=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=9B=86=E5=90=8E=E7=AB=AF=E6=8A=A5=E9=94=99=E4=BA=86?=
 =?UTF-8?q?=E5=89=8D=E7=AB=AF=E8=BF=9B=E5=BA=A6=E6=9D=A1=E8=BF=98=E5=9C=A8?=
 =?UTF-8?q?=E6=B6=A8'=20(#2622)=20from=20fix-1940=20into=20V20220801?=
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 6cf242bc..c9c36842 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-Merge branch 'V20220801' into fix-2454
+Merge pull request 'fix-1940 (还原修改) 上传数据集后端报错了前端进度条还在涨' (#2622) from fix-1940 into V20220801