From 6cd7f6762a627311a94521cf4beb2f2fc953b394 Mon Sep 17 00:00:00 2001
From: Chunxiang <gitea@fake.local>
Date: Tue, 14 Mar 2023 17:38:54 +0800
Subject: [PATCH] =?UTF-8?q?Merge=20pull=20request=20'=E5=A4=9A=E5=8D=A1?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E4=B8=8B=E7=9A=84=E8=B5=84=E6=BA=90=E5=8D=A0?=
 =?UTF-8?q?=E7=94=A8=E6=98=BE=E7=A4=BA=E6=95=88=E6=9E=9C'=20(#2290)=20from?=
 =?UTF-8?q?=20show-npu-metric=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..a334d368 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-Merge remote-tracking branch 'origin/V20220616' into zouap_static
+Merge pull request '多卡任务下的资源占用显示效果' (#2290) from show-npu-metric into V20220616