From ea329e12a1c4e2ff296941b05da3556feeaced96 Mon Sep 17 00:00:00 2001
From: Chunxiang <gitea@fake.local>
Date: Tue, 14 Mar 2023 17:38:53 +0800
Subject: [PATCH] =?UTF-8?q?Merge=20pull=20request=20'=E8=A7=A3=E5=86=B3?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=A8=A1=E5=9E=8B=E6=A1=86=E6=9E=B6=E4=B9=8B?=
 =?UTF-8?q?=E5=90=8E=EF=BC=8C=E6=9C=AA=E4=BF=9D=E5=AD=98=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E7=9A=84=E6=A8=A1=E5=9E=8B=E6=A1=86=E6=9E=B6=E5=80=BC?=
 =?UTF-8?q?=E3=80=82'=20(#2299)=20from=20zouap=20into=20V20220616?=
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 408d1dd6..baa0312c 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-Merge remote-tracking branch 'origin/V20220616' into zouap_static
+Merge pull request '解决选择模型框架之后，未保存自定义的模型框架值。' (#2299) from zouap into V20220616