From d0579dd36aff25f6a73a87f4b1f2e2457858d290 Mon Sep 17 00:00:00 2001
From: Chunxiang <gitea@fake.local>
Date: Tue, 14 Mar 2023 17:40:42 +0800
Subject: [PATCH] =?UTF-8?q?Merge=20pull=20request=20'fix-549=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E6=96=87=E4=BB=B6=E5=90=8D=E8=BF=87=E9=95=BF=E5=8D=95?=
 =?UTF-8?q?=E4=BD=8D=E5=A4=A7=E5=B0=8F=E4=B8=8D=E6=98=BE=E7=A4=BA'=20(#115?=
 =?UTF-8?q?4)=20from=20fix-549=20into=20V20211228?=
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 723c75a3..99021ca1 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-Merge branch 'V20211228' into fix-646
+Merge pull request 'fix-549 修复文件名过长单位大小不显示' (#1154) from fix-549 into V20211228