From 045e2a5a39523d1d45084dbe0070c6d2d22bd179 Mon Sep 17 00:00:00 2001
From: liuzx <liuzx@pcl.ac.cn>
Date: Tue, 14 Mar 2023 17:52:33 +0800
Subject: [PATCH] =?UTF-8?q?Merge=20pull=20request=20'=E4=BA=91=E8=84=91I?=
 =?UTF-8?q?=E8=B0=83=E8=AF=95=E7=BB=88=E6=80=81=E5=88=A0=E9=99=A4=E4=B8=8D?=
 =?UTF-8?q?=E7=BD=AE=E7=81=B0'=20(#2485)=20from=20gpu-inference=20into=20V?=
 =?UTF-8?q?20220718?=
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 3e826c14..a7aa7504 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-Merge branch 'V20220718' into zouap_static
+Merge pull request '云脑I调试终态删除不置灰' (#2485) from gpu-inference into V20220718