Merge branch '3.2.x' into 3.3.x
This commit is contained in:
commit
13f7820a6c
|
@ -41,6 +41,7 @@
|
||||||
</option>
|
</option>
|
||||||
</GroovyCodeStyleSettings>
|
</GroovyCodeStyleSettings>
|
||||||
<JavaCodeStyleSettings>
|
<JavaCodeStyleSettings>
|
||||||
|
<option name="BLANK_LINES_AROUND_FIELD_WITH_ANNOTATIONS" value="1" />
|
||||||
<option name="CLASS_NAMES_IN_JAVADOC" value="3" />
|
<option name="CLASS_NAMES_IN_JAVADOC" value="3" />
|
||||||
<option name="INSERT_INNER_CLASS_IMPORTS" value="true" />
|
<option name="INSERT_INNER_CLASS_IMPORTS" value="true" />
|
||||||
<option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="500" />
|
<option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="500" />
|
||||||
|
|
Loading…
Reference in New Issue