From df9ce5513cce452b20b9046d5b8c47ea8efb57bc Mon Sep 17 00:00:00 2001
From: jiang <gitea@fake.local>
Date: Tue, 14 Mar 2023 17:38:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/res-manage-v2' into
 res-manage-v2

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

diff --git a/src/test.txt b/src/test.txt
index 2d10d127..45708603 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-#2701 update grampus spec
+Merge remote-tracking branch 'origin/res-manage-v2' into res-manage-v2