Merge branch '3.2.x' into 3.3.x

1 year ago · 13f7820a6c
1 changed files with 1 additions and 0 deletions
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@ -41,6 +41,7 @@
				@@ -41,6 +41,7 @@
      </option>
    </GroovyCodeStyleSettings>
    <JavaCodeStyleSettings>
+      <option name="BLANK_LINES_AROUND_FIELD_WITH_ANNOTATIONS" value="1" />
      <option name="CLASS_NAMES_IN_JAVADOC" value="3" />
      <option name="INSERT_INNER_CLASS_IMPORTS" value="true" />
      <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="500" />