Browse Source

Merge branch 'master' into jimFirstDesign

jimFirstDesign
jim 2 years ago
parent
commit
1b2c1ae038
2 changed files with 21 additions and 0 deletions
  1. +16
    -0
      .idea/codeStyles/Project.xml
  2. +5
    -0
      .idea/codeStyles/codeStyleConfig.xml

+ 16
- 0
.idea/codeStyles/Project.xml View File

@@ -0,0 +1,16 @@
<component name="ProjectCodeStyleConfiguration">
<code_scheme name="Project" version="173">
<option name="LINE_SEPARATOR" value="&#10;" />
<codeStyleSettings language="JAVA">
<option name="SOFT_MARGINS" value="120" />
<indentOptions>
<option name="USE_TAB_CHARACTER" value="true" />
</indentOptions>
</codeStyleSettings>
<codeStyleSettings language="kotlin">
<indentOptions>
<option name="USE_TAB_CHARACTER" value="true" />
</indentOptions>
</codeStyleSettings>
</code_scheme>
</component>

+ 5
- 0
.idea/codeStyles/codeStyleConfig.xml View File

@@ -0,0 +1,5 @@
<component name="ProjectCodeStyleConfiguration">
<state>
<option name="USE_PER_PROJECT_SETTINGS" value="true" />
</state>
</component>

Loading…
Cancel
Save