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

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

diff --git a/src/test.txt b/src/test.txt
index 44007f99..8c002603 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-Merge remote-tracking branch 'origin/V20221228' into fix-csh
+solve conflict