From 4855c4e7c982e520343d2024d153d67016a54b60 Mon Sep 17 00:00:00 2001
From: chenyifan01 <cyf_uestc@outlook.com>
Date: Tue, 14 Mar 2023 17:51:40 +0800
Subject: [PATCH] Merge branch 'res-api' into api

---
 src/test.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test.txt b/src/test.txt
index aaea8792..ee0b216c 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-Merge remote-tracking branch 'origin/V20221102' into api
+Merge branch 'res-api' into api