Merge branch 'test'
This commit is contained in:
4
.idea/codeStyles/Project.xml
generated
4
.idea/codeStyles/Project.xml
generated
@@ -36,6 +36,10 @@
|
||||
<option name="INDENT_SIZE" value="2" />
|
||||
<option name="CONTINUATION_INDENT_SIZE" value="2" />
|
||||
<option name="TAB_SIZE" value="2" />
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
<option name="SMART_TABS" value="true" />
|
||||
>>>>>>> test
|
||||
</indentOptions>
|
||||
</codeStyleSettings>
|
||||
<codeStyleSettings language="JavaScript">
|
||||
|
||||
Reference in New Issue
Block a user