From 8c712ea68a4c4cba397ba9915682f391f25b6155 Mon Sep 17 00:00:00 2001
From: jiang <gitea@fake.local>
Date: Tue, 14 Mar 2023 17:36:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=85=8D=E7=BD=AE=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/test.txt b/src/test.txt
index 784265fe..70ec5675 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-conflict fix
+修复配置方式