From 69ee5dd619b875e9920f453ccb85e30614546e82 Mon Sep 17 00:00:00 2001
From: Chunxiang <gitea@fake.local>
Date: Tue, 14 Mar 2023 17:40:10 +0800
Subject: [PATCH] =?UTF-8?q?Merge=20pull=20request=20'=E4=BA=91=E8=84=912?=
 =?UTF-8?q?=E6=8E=A8=E7=90=86=E5=9C=A8=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=97=A0=E6=9D=83=E9=99=90=E7=94=A8=E6=88=B7=E5=BA=94=E9=9A=90?=
 =?UTF-8?q?=E8=97=8F=E6=8E=A8=E7=90=86=E7=BB=93=E6=9E=9C'=20(#1529)=20from?=
 =?UTF-8?q?=20fix-1488=20into=20V20220228?=
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 33b57b23..0be142e4 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-Merge remote-tracking branch 'origin/V20220228' into zouap_user
+Merge pull request '云脑2推理在详情页面无权限用户应隐藏推理结果' (#1529) from fix-1488 into V20220228