Merge branch 'test'

This commit is contained in:
2023-11-29 15:33:51 +08:00
103 changed files with 14556 additions and 4404 deletions

View File

@@ -36,6 +36,10 @@
<option name="INDENT_SIZE" value="2" />
<option name="CONTINUATION_INDENT_SIZE" value="2" />
<option name="TAB_SIZE" value="2" />
<<<<<<< HEAD
=======
<option name="SMART_TABS" value="true" />
>>>>>>> test
</indentOptions>
</codeStyleSettings>
<codeStyleSettings language="JavaScript">