From 57918446b573be700be2e339dd7ca062047b3f97 Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Tue, 14 Mar 2023 17:52:07 +0800
Subject: [PATCH] =?UTF-8?q?Merge=20pull=20request=20'=E5=85=B3=E8=81=94?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E9=98=BB=E6=AD=A2=E4=BA=8B=E4=BB=B6?=
 =?UTF-8?q?=E5=86=92=E6=B3=A1=E5=92=8C=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?'=20(#2778)=20from=20fix-2764=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 1565f000..668b3033 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-Merge remote-tracking branch 'origin/V20220830' into res-manage-v2
+Merge pull request '关联数据集阻止事件冒泡和样式修改' (#2778) from fix-2764 into V20220830