From cec4981e7659d027e2ff8bb206473dc929bc6acf Mon Sep 17 00:00:00 2001
From: lusiyi <gitea@fake.local>
Date: Tue, 14 Mar 2023 17:33:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=AC=A1=E7=BA=A7=E5=85=BC=E5=AE=B9=E4=B8=94?=
 =?UTF-8?q?=E7=BB=84=E5=90=88=E5=85=BC=E5=AE=B9-->=E7=BB=84=E5=90=88?=
 =?UTF-8?q?=E5=85=BC=E5=AE=B9?=
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 d56ec15b..14b1f71f 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-Merge branch 'master' of https
\ No newline at end of file
+次级兼容且组合兼容-->组合兼容