From ec30aa49730a68b1d6d9570976d0e8b0fa69263d Mon Sep 17 00:00:00 2001
From: jiang <gitea@fake.local>
Date: Tue, 14 Mar 2023 17:36:59 +0800
Subject: [PATCH] Merge branch 'V20221228' into fix-3262

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

diff --git a/src/test.txt b/src/test.txt
index 8c002603..5ac85558 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-solve conflict
+Merge branch 'V20221228' into fix-3262