summaryrefslogtreecommitdiff
path: root/.editorconfig
diff options
context:
space:
mode:
authorJesse Plamondon-Willard <github@jplamondonw.com>2018-08-01 11:07:29 -0400
committerJesse Plamondon-Willard <github@jplamondonw.com>2018-08-01 11:07:29 -0400
commit60b41195778af33fd609eab66d9ae3f1d1165e8f (patch)
tree7128b906d40e94c56c34ed6058f27bc31c31a08b /.editorconfig
parentb9bc1a6d17cafa0a97b46ffecda432cfc2f23b51 (diff)
parent52cf953f685c65b2b6814e375ec9a5ffa03c440a (diff)
downloadSMAPI-60b41195778af33fd609eab66d9ae3f1d1165e8f.tar.gz
SMAPI-60b41195778af33fd609eab66d9ae3f1d1165e8f.tar.bz2
SMAPI-60b41195778af33fd609eab66d9ae3f1d1165e8f.zip
Merge branch 'develop' into stable
Diffstat (limited to '.editorconfig')
-rw-r--r--.editorconfig7
1 files changed, 3 insertions, 4 deletions
diff --git a/.editorconfig b/.editorconfig
index a5cdcf97..126fdbd4 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -12,12 +12,11 @@ insert_final_newline = true
trim_trailing_whitespace = true
charset = utf-8
-[*.csproj]
+[*.{csproj,json,nuspec,targets}]
indent_size = 2
-insert_final_newline = false
-[*.json]
-indent_size = 2
+[*.csproj]
+insert_final_newline = false
##########
## C# formatting