From 2f78ef164653d5d30732d6e2e3f822a68de63010 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 30 十一月 2023 09:41:39 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

---
 springboot-vue3/.idea/.gitignore |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/springboot-vue3/.idea/.gitignore b/springboot-vue3/.idea/.gitignore
index 91ee315..081b737 100644
--- a/springboot-vue3/.idea/.gitignore
+++ b/springboot-vue3/.idea/.gitignore
@@ -1,8 +1,8 @@
-# 榛樿蹇界暐鐨勬枃浠�
-/shelf/
-/workspace.xml
-# 鏁版嵁婧愭湰鍦板瓨鍌ㄥ凡蹇界暐鏂囦欢
-/dataSources/
-/dataSources.local.xml
-# 鍩轰簬缂栬緫鍣ㄧ殑 HTTP 瀹㈡埛绔姹�
-/httpRequests/
+# 榛樿蹇界暐鐨勬枃浠�
+/shelf/
+/workspace.xml
+# 鏁版嵁婧愭湰鍦板瓨鍌ㄥ凡蹇界暐鏂囦欢
+/dataSources/
+/dataSources.local.xml
+# 鍩轰簬缂栬緫鍣ㄧ殑 HTTP 瀹㈡埛绔姹�
+/httpRequests/

--
Gitblit v1.8.0