From e86645790439d170d959cd59c44d87663e51af02 Mon Sep 17 00:00:00 2001
From: zhoupzh <zhoupzh@pcl.ac.cn>
Date: Tue, 14 Mar 2023 17:51:57 +0800
Subject: [PATCH] Merge branch 'fix-2817' into pretrainmodel

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

diff --git a/src/test.txt b/src/test.txt
index 4ea5e4dd..9ae1facd 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-update
+Merge branch 'fix-2817' into pretrainmodel