From 6a39b47eb28e234e4bf1a33c5f25295bd171dac6 Mon Sep 17 00:00:00 2001
From: zhoupzh <zhoupzh@pcl.ac.cn>
Date: Tue, 14 Mar 2023 17:52:32 +0800
Subject: [PATCH] Merge branch 'V20220718' into gpu-inference

---
 src/test.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test.txt b/src/test.txt
index a77334a5..c92e4ac7 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-Merge pull request '任务队列显示waitcount正确' (#2515) from gpu-inference into V20220718
+Merge branch 'V20220718' into gpu-inference