From 1238c9e5e6c625b5df597752f3882589babccab3 Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Tue, 14 Mar 2023 17:52:11 +0800
Subject: [PATCH] =?UTF-8?q?Merge=20pull=20request=20'fix-2628=20=E7=BB=88?=
 =?UTF-8?q?=E6=80=81=E7=9A=84=E6=83=85=E5=86=B5=E4=B8=8B=E6=89=8D=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5=E7=82=B9=E5=87=BB=E5=88=A0=E9=99=A4=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?'=20(#2740)=20from=20fix-2628=20into=20V20220830?=
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 9ea095b7..5d70f096 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-Merge branch 'V20220830' into fix-2546
+Merge pull request 'fix-2628 终态的情况下才可以点击删除按钮' (#2740) from fix-2628 into V20220830