From 1d1db9d147b3a2446c1dc9536e33a28b991afe5f Mon Sep 17 00:00:00 2001
From: jiang <gitea@fake.local>
Date: Tue, 14 Mar 2023 17:36:58 +0800
Subject: [PATCH] Merge branch 'feature_ide_20221214' of https

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

diff --git a/src/test.txt b/src/test.txt
index 840f770b..2a3aa6c7 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-注释mock和oss，记得上线删除
+Merge branch 'feature_ide_20221214' of https
\ No newline at end of file