From 3efc8263480aaac3de7a4ed32488c5249878472e Mon Sep 17 00:00:00 2001
From: Jonny <gitea@fake.local>
Date: Tue, 14 Mar 2023 17:41:44 +0800
Subject: [PATCH] =?UTF-8?q?Merge=20pull=20request=20'=E9=80=82=E9=85=8D?=
 =?UTF-8?q?=E4=BA=91=E8=84=91=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9'=20(#158?=
 =?UTF-8?q?)=20from=20fix-getimageinfo=20into=20develop?=
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 52357379..c9664b94 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-Merge branch 'develop' of https
\ No newline at end of file
+Merge pull request '适配云脑接口修改' (#158) from fix-getimageinfo into develop