aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenny Root <kenny@the-b.org>2015-09-23 14:05:18 -0700
committerKenny Root <kenny@the-b.org>2015-09-23 14:05:18 -0700
commitd9e279cb7b994d9781d8f1d4195c0263822a3893 (patch)
tree72393eedcc3391ad637c37ca50674a575b2a3eae
parent094afdff12637ebe75b06b21be3f84d70e7d1421 (diff)
parent4e4ba5d7eb69fdf202e00294e85fb73d5283bb02 (diff)
downloadconnectbot-d9e279cb7b994d9781d8f1d4195c0263822a3893.tar.gz
connectbot-d9e279cb7b994d9781d8f1d4195c0263822a3893.tar.bz2
connectbot-d9e279cb7b994d9781d8f1d4195c0263822a3893.zip
Merge pull request #211 from khorimoto/fix-tabs
Use 4 spaces per tab instead of 8.
-rw-r--r--.idea/codeStyleSettings.xml21
1 files changed, 10 insertions, 11 deletions
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
index 1ca6443..8e56756 100644
--- a/.idea/codeStyleSettings.xml
+++ b/.idea/codeStyleSettings.xml
@@ -77,17 +77,11 @@
</XML>
<codeStyleSettings language="Groovy">
<indentOptions>
- <option name="INDENT_SIZE" value="8" />
- <option name="CONTINUATION_INDENT_SIZE" value="16" />
- <option name="TAB_SIZE" value="8" />
<option name="USE_TAB_CHARACTER" value="true" />
</indentOptions>
</codeStyleSettings>
<codeStyleSettings language="HTML">
<indentOptions>
- <option name="INDENT_SIZE" value="8" />
- <option name="CONTINUATION_INDENT_SIZE" value="16" />
- <option name="TAB_SIZE" value="8" />
<option name="USE_TAB_CHARACTER" value="true" />
</indentOptions>
</codeStyleSettings>
@@ -96,17 +90,22 @@
<option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
<option name="SPACE_BEFORE_ARRAY_INITIALIZER_LBRACE" value="true" />
<indentOptions>
- <option name="INDENT_SIZE" value="8" />
- <option name="CONTINUATION_INDENT_SIZE" value="16" />
- <option name="TAB_SIZE" value="8" />
+ <option name="USE_TAB_CHARACTER" value="true" />
+ </indentOptions>
+ </codeStyleSettings>
+ <codeStyleSettings language="JSON">
+ <indentOptions>
+ <option name="USE_TAB_CHARACTER" value="true" />
+ </indentOptions>
+ </codeStyleSettings>
+ <codeStyleSettings language="ObjectiveC">
+ <indentOptions>
<option name="USE_TAB_CHARACTER" value="true" />
</indentOptions>
</codeStyleSettings>
<codeStyleSettings language="XML">
<option name="FORCE_REARRANGE_MODE" value="1" />
<indentOptions>
- <option name="INDENT_SIZE" value="8" />
- <option name="TAB_SIZE" value="8" />
<option name="USE_TAB_CHARACTER" value="true" />
</indentOptions>
<arrangement>