WS-11.0.3 <marti@DESKTOP-ITST4MB Merge branch 'master'

Conflicts:
	colors/Cobalt copy.icls
This commit is contained in:
martind2000 2016-03-15 21:56:09 +00:00
commit c3348517a2
2 changed files with 12 additions and 0 deletions

5
code.style.schemes.xml Normal file
View File

@ -0,0 +1,5 @@
<application>
<component name="CodeStyleSchemeSettings">
<option name="CURRENT_SCHEME_NAME" value="Martins Style" />
</component>
</application>

View File

@ -28,6 +28,13 @@
<XML> <XML>
<option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" /> <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
</XML> </XML>
<codeStyleSettings language="HTML">
<indentOptions>
<option name="INDENT_SIZE" value="2" />
<option name="CONTINUATION_INDENT_SIZE" value="2" />
<option name="TAB_SIZE" value="2" />
</indentOptions>
</codeStyleSettings>
<codeStyleSettings language="Jade"> <codeStyleSettings language="Jade">
<indentOptions> <indentOptions>
<option name="INDENT_SIZE" value="2" /> <option name="INDENT_SIZE" value="2" />