From 8904f2828ac5e603d0bd84e27a0cf32ab7d23415 Mon Sep 17 00:00:00 2001
From: Chunxiang <gitea@fake.local>
Date: Tue, 14 Mar 2023 17:40:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=86=B2=E7=AA=81=E3=80=82?=
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 cbc44858..565f1bab 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-修改里程碑筛选项
+合并冲突。