From 6b476fa75f54e6b98e639941675a8d1fa49cfee4 Mon Sep 17 00:00:00 2001 From: Vasily Alferov <ya-ikmik2012@yandex.ru> Date: Thu, 29 Mar 2018 10:34:44 +0530 Subject: [PATCH] Fix accidentally changed file --- .idea/codeStyles/Project.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index b8506fa54..2097563a8 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -2,7 +2,14 @@ <code_scheme name="Project" version="173"> <option name="OTHER_INDENT_OPTIONS"> <value> + <option name="INDENT_SIZE" value="4" /> <option name="CONTINUATION_INDENT_SIZE" value="4" /> + <option name="TAB_SIZE" value="4" /> + <option name="USE_TAB_CHARACTER" value="false" /> + <option name="SMART_TABS" value="false" /> + <option name="LABEL_INDENT_SIZE" value="0" /> + <option name="LABEL_INDENT_ABSOLUTE" value="false" /> + <option name="USE_RELATIVE_INDENTS" value="false" /> </value> </option> <option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" /> @@ -63,6 +70,7 @@ <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" /> <option name="FOR_STATEMENT_WRAP" value="5" /> <option name="ASSIGNMENT_WRAP" value="1" /> + <option name="PARENT_SETTINGS_INSTALLED" value="true" /> </codeStyleSettings> <codeStyleSettings language="ECMA Script Level 4"> <option name="KEEP_LINE_BREAKS" value="false" /> @@ -88,6 +96,7 @@ <option name="DOWHILE_BRACE_FORCE" value="1" /> <option name="WHILE_BRACE_FORCE" value="1" /> <option name="FOR_BRACE_FORCE" value="1" /> + <option name="PARENT_SETTINGS_INSTALLED" value="true" /> </codeStyleSettings> <codeStyleSettings language="GSP"> <indentOptions> @@ -121,6 +130,7 @@ <option name="WHILE_BRACE_FORCE" value="1" /> <option name="FOR_BRACE_FORCE" value="1" /> <option name="FIELD_ANNOTATION_WRAP" value="0" /> + <option name="PARENT_SETTINGS_INSTALLED" value="true" /> <indentOptions> <option name="INDENT_SIZE" value="2" /> </indentOptions> @@ -166,6 +176,7 @@ <option name="WHILE_BRACE_FORCE" value="1" /> <option name="FOR_BRACE_FORCE" value="1" /> <option name="FIELD_ANNOTATION_WRAP" value="0" /> + <option name="PARENT_SETTINGS_INSTALLED" value="true" /> <indentOptions> <option name="INDENT_SIZE" value="2" /> <option name="CONTINUATION_INDENT_SIZE" value="2" /> @@ -174,6 +185,7 @@ </codeStyleSettings> <codeStyleSettings language="JSON"> <option name="KEEP_LINE_BREAKS" value="false" /> + <option name="PARENT_SETTINGS_INSTALLED" value="true" /> </codeStyleSettings> <codeStyleSettings language="JSP"> <indentOptions> @@ -203,11 +215,15 @@ <option name="DOWHILE_BRACE_FORCE" value="1" /> <option name="WHILE_BRACE_FORCE" value="1" /> <option name="FOR_BRACE_FORCE" value="1" /> + <option name="PARENT_SETTINGS_INSTALLED" value="true" /> </codeStyleSettings> <codeStyleSettings language="Python"> <option name="KEEP_LINE_BREAKS" value="false" /> <option name="PARENT_SETTINGS_INSTALLED" value="true" /> </codeStyleSettings> + <codeStyleSettings language="SQL"> + <option name="PARENT_SETTINGS_INSTALLED" value="true" /> + </codeStyleSettings> <codeStyleSettings language="XML"> <indentOptions> <option name="INDENT_SIZE" value="2" />