From 901dd45c71e52074c7ee0041398f5901e8aab4e6 Mon Sep 17 00:00:00 2001
From: Chunxiang <gitea@fake.local>
Date: Tue, 14 Mar 2023 17:39:49 +0800
Subject: [PATCH] Merge pull request 'fix issue' (#1759) from fix-conflict into
 V20220328

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

diff --git a/src/test.txt b/src/test.txt
index e7bb6761..8f92d5e9 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-fix issue
+Merge pull request 'fix issue' (#1759) from fix-conflict into V20220328