Merge upstream changes from master

This commit is contained in:
Z. Charles Dziura 2024-08-16 10:20:53 -04:00
commit fb2a631da1

View file

@ -9,6 +9,10 @@ indent_style = tab
insert_final_newline = true insert_final_newline = true
tab_width = 4 tab_width = 4
trim_trailing_whitespace = true trim_trailing_whitespace = true
<<<<<<< Updated upstream
[*.{yml,yaml}] [*.{yml,yaml}]
indent_style = space indent_style = space
=======
ij_kotlin_name_count_to_use_star_import = 2147483647
>>>>>>> Stashed changes