Conflicts: colors/_@user_Darcula.iclsmaster
@@ -1,8 +1,8 @@ | |||||
<application> | <application> | ||||
<component name="DefaultFont"> | <component name="DefaultFont"> | ||||
<option name="VERSION" value="1" /> | <option name="VERSION" value="1" /> | ||||
<option name="FONT_SIZE" value="10" /> | |||||
<option name="FONT_SIZE_2D" value="10.2" /> | |||||
<option name="FONT_SIZE" value="12" /> | |||||
<option name="FONT_SIZE_2D" value="12.0" /> | |||||
<option name="FONT_FAMILY" value="MonoLisa" /> | <option name="FONT_FAMILY" value="MonoLisa" /> | ||||
<option name="FONT_REGULAR_SUB_FAMILY" value="Regular" /> | <option name="FONT_REGULAR_SUB_FAMILY" value="Regular" /> | ||||
<option name="FONT_BOLD_SUB_FAMILY" value="Bold" /> | <option name="FONT_BOLD_SUB_FAMILY" value="Bold" /> | ||||
@@ -4,7 +4,6 @@ | |||||
<option name="IS_ENSURE_NEWLINE_AT_EOF" value="true" /> | <option name="IS_ENSURE_NEWLINE_AT_EOF" value="true" /> | ||||
<option name="SHOW_BREADCRUMBS" value="false" /> | <option name="SHOW_BREADCRUMBS" value="false" /> | ||||
<option name="IS_BLOCK_CURSOR" value="true" /> | <option name="IS_BLOCK_CURSOR" value="true" /> | ||||
<option name="IS_WHITESPACES_SHOWN" value="true" /> | |||||
</component> | </component> | ||||
<component name="JSEditorOptions"> | <component name="JSEditorOptions"> | ||||
<option name="START_STRING_INTERPOLATION_ON_TYPING" value="true" /> | <option name="START_STRING_INTERPOLATION_ON_TYPING" value="true" /> | ||||
@@ -1,7 +1,6 @@ | |||||
<application> | <application> | ||||
<component name="MaterialThemeConfig"> | <component name="MaterialThemeConfig"> | ||||
<option name="customTreeIndentEnabled" value="true" /> | <option name="customTreeIndentEnabled" value="true" /> | ||||
<option name="allowDataCollection" value="true" /> | |||||
<option name="autoResetColorScheme" value="true" /> | <option name="autoResetColorScheme" value="true" /> | ||||
<option name="compactSidebar" value="true" /> | <option name="compactSidebar" value="true" /> | ||||
<option name="isCustomTreeIndentEnabled" value="true" /> | <option name="isCustomTreeIndentEnabled" value="true" /> | ||||