From 9bbd07ed0f8a3907ee081da25cfdfb829dadb5ec Mon Sep 17 00:00:00 2001
From: Chunxiang <gitea@fake.local>
Date: Tue, 14 Mar 2023 17:41:04 +0800
Subject: [PATCH] =?UTF-8?q?Merge=20pull=20request=20'=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=8E=92=E5=BA=8F'=20(#847)=20from=20fix-828?=
 =?UTF-8?q?=20into=20V20211115?=
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 86dd592d..49c9ce76 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-Merge branch 'V20211115' into wangjr_pro
+Merge pull request '项目数据排序' (#847) from fix-828 into V20211115