From 858674931859358039f6259cd1933b2d447b4966 Mon Sep 17 00:00:00 2001
From: Tim Kung <tkung@silverstripe.com>
Date: Sat, 22 Apr 2017 04:05:46 +0200
Subject: [PATCH] Updating editorconfig

(cherry picked from commit 2f99e51)
---
 .editorconfig | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 47ae637..babe7db 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,6 +1,6 @@
-# For more information about the properties used in this file,
-# please see the EditorConfig documentation:
-# http://editorconfig.org
+# For more information about the properties used in
+# this file, please see the EditorConfig documentation:
+# http://editorconfig.org/
 
 [*]
 charset = utf-8
@@ -10,8 +10,14 @@ indent_style = space
 insert_final_newline = true
 trim_trailing_whitespace = true
 
-[{*.yml,package.json}]
+[*.md]
+trim_trailing_whitespace = false
+
+[*.yml]
 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
+indent_size = 2
+indent_style = space