From fde624998f89ee20394bb5a310eaf53c744286f5 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期四, 13 十月 2022 15:59:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'ruoyi-vue/master' into dev

---
 .editorconfig |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 8cfd370..25b312e 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -10,10 +10,7 @@
 trim_trailing_whitespace = true
 insert_final_newline = true
 
-[*.java]
-indent_style = tab
-
-[*.{json,yml}]
+[*.{json,yml,yaml}]
 indent_size = 2
 
 [*.md]

--
Gitblit v1.9.3