From 80468665c42279245cf2f7562c7d5ec352c9e280 Mon Sep 17 00:00:00 2001
From: weishao <wanwei@educoder.com>
Date: Tue, 14 Mar 2023 17:50:43 +0800
Subject: [PATCH] Merge branch 'feature_ide_20221214' into
 v20230215_ide_feature

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

diff --git a/src/test.txt b/src/test.txt
index 1d74f25e..2ed07005 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-Merge remote-tracking branch 'origin/V20230215' into zouap_static
+Merge branch 'feature_ide_20221214' into v20230215_ide_feature