Un-ignoring .idea/codeStyles/ to make merge possible

This commit is contained in:
Shams Asari 2018-11-09 14:48:08 +00:00
parent 72be3aa830
commit 8442b13e5e
3 changed files with 18 additions and 1 deletions

1
.gitignore vendored
View File

@ -38,7 +38,6 @@ lib/quasar.jar
.idea/markdown-navigator
.idea/runConfigurations
.idea/dictionaries
.idea/codeStyles/
# Include the -parameters compiler option by default in IntelliJ required for serialization.
!.idea/compiler.xml

13
.idea/codeStyles/Project.xml generated Normal file
View File

@ -0,0 +1,13 @@
<component name="ProjectCodeStyleConfiguration">
<code_scheme name="Project" version="173">
<JetCodeStyleSettings>
<option name="PACKAGES_TO_USE_STAR_IMPORTS">
<value>
<package name="java.util" withSubpackages="false" static="false" />
<package name="kotlinx.android.synthetic" withSubpackages="true" static="false" />
<package name="tornadofx" withSubpackages="false" static="false" />
</value>
</option>
</JetCodeStyleSettings>
</code_scheme>
</component>

5
.idea/codeStyles/codeStyleConfig.xml generated Normal file
View File

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