From 2fe5673792a7b6fdf43fa214af7c9faa4223758c Mon Sep 17 00:00:00 2001
From: Chunxiang <gitea@fake.local>
Date: Tue, 14 Mar 2023 17:41:07 +0800
Subject: [PATCH] =?UTF-8?q?Merge=20pull=20request=20'=E4=BF=AE=E6=94=B9bug?=
 =?UTF-8?q?,=E8=B0=83=E7=94=A8=E5=8D=87=E7=BA=A7=E8=84=9A=E6=9C=AC?=
 =?UTF-8?q?=E5=87=BD=E6=95=B0=E7=9A=84=E4=BD=8D=E7=BD=AE=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?'=20(#807)=20from=20fix-674=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 c9e33587..94d3e455 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-Merge remote-tracking branch 'origin/V20211115' into zouap
+Merge pull request '修改bug,调用升级脚本函数的位置错误' (#807) from fix-674 into V20211115