From c936f11d26953b6840e213b38e5dea2171959a94 Mon Sep 17 00:00:00 2001
From: jiang <gitea@fake.local>
Date: Tue, 14 Mar 2023 17:36:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/V20230215' 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 79bdd179..1d74f25e 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-Merge branch 'V20230215' into V20221228.patch
+Merge remote-tracking branch 'origin/V20230215' into zouap_static