From 70cd8bc2584c0431b2efda4f037f26c57fafeb20 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 14 Mar 2023 17:52:31 +0800
Subject: [PATCH] Merge branch 'V20220718' into zouap_static

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

diff --git a/src/test.txt b/src/test.txt
index 266b5dea..3e826c14 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-Merge branch 'V20220718' into fix-1956
+Merge branch 'V20220718' into zouap_static