summaryrefslogtreecommitdiff
path: root/.editorconfig
diff options
context:
space:
mode:
authorJesse Plamondon-Willard <Pathoschild@users.noreply.github.com>2019-09-13 18:24:54 -0400
committerJesse Plamondon-Willard <Pathoschild@users.noreply.github.com>2019-09-13 18:24:54 -0400
commit6521df7b131924835eb797251c1e956fae0d6e13 (patch)
treeb704dc64b6b6fef72615bac8950d5eff3c80ea89 /.editorconfig
parente22a54212182d0adc443ac95bc791e83c90f7e10 (diff)
parentb7b8b001c5c2dc5d2c9fc1347532ca29368c2325 (diff)
downloadSMAPI-6521df7b131924835eb797251c1e956fae0d6e13.tar.gz
SMAPI-6521df7b131924835eb797251c1e956fae0d6e13.tar.bz2
SMAPI-6521df7b131924835eb797251c1e956fae0d6e13.zip
Merge branch 'develop' into stable
Diffstat (limited to '.editorconfig')
-rw-r--r--.editorconfig6
1 files changed, 5 insertions, 1 deletions
diff --git a/.editorconfig b/.editorconfig
index 5bfc44bd..38f3c261 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -12,12 +12,16 @@ insert_final_newline = true
trim_trailing_whitespace = true
charset = utf-8
-[*.{csproj,json,nuspec,targets}]
+[*.{csproj,nuspec,targets}]
indent_size = 2
[*.csproj]
+charset = utf-8-bom
insert_final_newline = false
+[README.txt]
+end_of_line=crlf
+
##########
## C# formatting
## documentation: https://docs.microsoft.com/en-us/visualstudio/ide/editorconfig-code-style-settings-reference