Merge branch '3.3.x' into 3.4.x
This commit is contained in:
commit
fa621f2d95
|
@ -51,6 +51,8 @@
|
||||||
</option>
|
</option>
|
||||||
<option name="IMPORT_LAYOUT_TABLE">
|
<option name="IMPORT_LAYOUT_TABLE">
|
||||||
<value>
|
<value>
|
||||||
|
<package name="" withSubpackages="true" static="false" module="true" />
|
||||||
|
<emptyLine />
|
||||||
<package name="java" withSubpackages="true" static="false" />
|
<package name="java" withSubpackages="true" static="false" />
|
||||||
<emptyLine />
|
<emptyLine />
|
||||||
<package name="javax" withSubpackages="true" static="false" />
|
<package name="javax" withSubpackages="true" static="false" />
|
||||||
|
@ -119,4 +121,4 @@
|
||||||
</indentOptions>
|
</indentOptions>
|
||||||
</codeStyleSettings>
|
</codeStyleSettings>
|
||||||
</code_scheme>
|
</code_scheme>
|
||||||
</component>
|
</component>
|
||||||
|
|
Loading…
Reference in New Issue