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