From 193a0d5a997fb9afb706b79f2e2abf36bb66da72 Mon Sep 17 00:00:00 2001
From: "Z. Charles Dziura" <zachary@dziura.email>
Date: Thu, 15 Aug 2024 09:27:56 -0400
Subject: [PATCH] Updates to editorconfig

---
 .editorconfig | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.editorconfig b/.editorconfig
index cef1c46..82a59af 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -9,6 +9,10 @@ indent_style = tab
 insert_final_newline = true
 tab_width = 4
 trim_trailing_whitespace = true
+<<<<<<< Updated upstream
 
 [*.{yml,yaml}]
 indent_style = space
+=======
+ij_kotlin_name_count_to_use_star_import = 2147483647
+>>>>>>> Stashed changes