From c003916f369604578561d2aa7abbe750b15af89b Mon Sep 17 00:00:00 2001
From: jiang <gitea@fake.local>
Date: Tue, 14 Mar 2023 17:37:24 +0800
Subject: [PATCH] =?UTF-8?q?Merge=20pull=20request=20'=E4=BF=AE=E5=A4=8D=20?=
 =?UTF-8?q?-=E7=AE=A1=E7=90=86=E5=90=8E=E5=8F=B0=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90=E6=B1=A0=E9=98=9F=E5=88=97=E7=9A=84=E5=8D=A1?=
 =?UTF-8?q?=E6=95=B0=E4=B8=BA0=E6=97=B6=E4=BC=9A=E5=A4=B1=E8=B4=A5'=20(#31?=
 =?UTF-8?q?74)=20from=20fix-3163=20into=20V20221116?=
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 120c1322..db203fbd 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-Merge pull request 'fix-3168' (#3171) from fix-3168 into V20221116
+Merge pull request '修复 -管理后台修改资源池队列的卡数为0时会失败' (#3174) from fix-3163 into V20221116