From 717e5d7f988d08c5c922da4fca7d942c477dc671 Mon Sep 17 00:00:00 2001
From: Chunxiang <gitea@fake.local>
Date: Tue, 14 Mar 2023 17:40:26 +0800
Subject: [PATCH] =?UTF-8?q?Merge=20pull=20request=20'=E8=A7=A3=E5=86=B3htt?=
 =?UTF-8?q?ps=E7=9A=84=20websocket=E8=AF=B7=E6=B1=82'=20(#1306)=20from=20z?=
 =?UTF-8?q?ouap=5F1=20into=20V20220110?=
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 9aa9bd39..77f2d4b3 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-Merge pull request 'V20220110合入develop' (#1307) from V20220110 into develop
+Merge pull request '解决https的 websocket请求' (#1306) from zouap_1 into V20220110