From ae9ea05c951ca9e0be16353a8145c2f5f98e6d98 Mon Sep 17 00:00:00 2001
From: jiang <gitea@fake.local>
Date: Tue, 14 Mar 2023 17:36:47 +0800
Subject: [PATCH] conflict fix

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

diff --git a/src/test.txt b/src/test.txt
index 9006a077..784265fe 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-Merge pull request 'fix-3578' (#3596) from fix-3578 into V20230215
+conflict fix