From 9342bbef5659a43114193a725a96ad852eec7a79 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 17 九月 2021 23:39:27 +0800
Subject: [PATCH] fix 修复合并错误
---
.editorconfig | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/.editorconfig b/.editorconfig
index 8cfd370..672defc 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -10,9 +10,6 @@
trim_trailing_whitespace = true
insert_final_newline = true
-[*.java]
-indent_style = tab
-
[*.{json,yml}]
indent_size = 2
--
Gitblit v1.9.3