Updating editorconfig

(cherry picked from commit 2f99e51)
This commit is contained in:
Tim Kung 2017-04-22 04:05:46 +02:00 committed by Werner M. Krauß
parent b8f98323ae
commit 8586749318

View File

@ -1,6 +1,6 @@
# For more information about the properties used in this file, # For more information about the properties used in
# please see the EditorConfig documentation: # this file, please see the EditorConfig documentation:
# http://editorconfig.org # http://editorconfig.org/
[*] [*]
charset = utf-8 charset = utf-8
@ -10,8 +10,14 @@ indent_style = space
insert_final_newline = true insert_final_newline = true
trim_trailing_whitespace = true trim_trailing_whitespace = true
[{*.yml,package.json}] [*.md]
trim_trailing_whitespace = false
[*.yml]
indent_size = 2 indent_size = 2
# The indent size used in the package.json file cannot be changed: [{.travis.yml,package.json,composer.json}]
# The indent size used in the `package.json` file cannot be changed
# https://github.com/npm/npm/pull/3180#issuecomment-16336516 # https://github.com/npm/npm/pull/3180#issuecomment-16336516
indent_size = 2
indent_style = space