From 9211a91d1ca7dc4872f1f3838685b5f5bb6fbc55 Mon Sep 17 00:00:00 2001
From: Albumen Kevin <jhq0812@gmail.com>
Date: Fri, 19 Jan 2024 15:19:48 +0800
Subject: [PATCH] Fix conflicts

---
 .editorconfig | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 5f30c32f450..5de62e0893b 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -71,6 +71,3 @@ ij_xml_keep_blank_lines = 1
 
 [pom.xml]
 indent_size = 2
-
-[pom.xml]
-indent_size = 2