From 50deb55473f54cd32c575c5601eb0c3fbb40d31c Mon Sep 17 00:00:00 2001
From: zhoupzh <zhoupzh@pcl.ac.cn>
Date: Tue, 14 Mar 2023 17:52:33 +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 0bd2353b..c92e4ac7 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-feat: 界面开发2
+Merge branch 'V20220718' into gpu-inference