From 5b8633409bfa4fdcd01d5dfc1eecb8098151a9f5 Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Tue, 14 Mar 2023 17:52:25 +0800
Subject: [PATCH] =?UTF-8?q?Merge=20pull=20request=20'Merge=20pull=20reques?=
 =?UTF-8?q?t=20'fix-2593=20=E9=80=89=E6=8B=A9=E6=95=B0=E6=8D=AE=E9=9B=86?=
 =?UTF-8?q?=E7=AA=97=E5=8F=A3=E7=9A=84=E6=90=9C=E7=B4=A2=E6=A1=86=E6=8C=89?=
 =?UTF-8?q?=E5=9B=9E=E8=BD=A6=E9=94=AE=E4=B8=8D=E5=BA=94=E8=A7=A6=E5=8F=91?=
 =?UTF-8?q?=E6=96=B0=E5=BB=BA=E4=BB=BB=E5=8A=A1'=20(#2596)=20from=20fix-25?=
 =?UTF-8?q?93=20into=20V20220801'=20(#2605)=20from=20V20220801=20into=20fi?=
 =?UTF-8?q?x-2593?=
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 4fc2eb40..5d3f983c 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-fix-2593 选择数据集窗口的搜索框按回车键不应触发新建任务
+Merge pull request 'Merge pull request 'fix-2593 选择数据集窗口的搜索框按回车键不应触发新建任务' (#2596) from fix-2593 into V20220801' (#2605) from V20220801 into fix-2593