Merge remote-tracking branch 'origin/master'

This commit is contained in:
Olga Maciaszek-Sharma
2019-02-07 19:56:07 +01:00
7 changed files with 286 additions and 138 deletions

View File

@@ -4,7 +4,7 @@
<option name="USE_TAB_CHARACTER" value="true"/>
</value>
</option>
<option name="RIGHT_MARGIN" value="90"/>
<option name="RIGHT_MARGIN" value="120"/>
<option name="FORMATTER_TAGS_ENABLED" value="true"/>
<GroovyCodeStyleSettings>
<option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99"/>
@@ -84,4 +84,4 @@
<option name="USE_TAB_CHARACTER" value="true"/>
</indentOptions>
</codeStyleSettings>
</code_scheme>
</code_scheme>