From 7af562c5ebd92eab123419cb4261545f2b4a6bae Mon Sep 17 00:00:00 2001
From: liuzx <liuzx@pcl.ac.cn>
Date: Tue, 14 Mar 2023 17:51:31 +0800
Subject: [PATCH] =?UTF-8?q?Merge=20pull=20request=20'=E6=99=BA=E7=AE=97?=
 =?UTF-8?q?=E7=BD=91=E7=BB=9CNPU=E8=AE=AD=E7=BB=83=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E6=96=B0=E5=A2=9E=E8=B5=84?=
 =?UTF-8?q?=E6=BA=90=E5=8D=A0=E7=94=A8=E6=83=85=E5=86=B5=E9=A1=B5=E7=AD=BE?=
 =?UTF-8?q?'=20(#3195)=20from=20fix-3105=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 7034394a..cc287ee8 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-合并主分支代码。
+Merge pull request '智算网络NPU训练任务详情页面新增资源占用情况页签' (#3195) from fix-3105 into V20221116