From d93148ffbdc8c9a5253918cfe680581dd5bbcd70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20Go=C3=9Fe?= <flo@essog.de>
Date: Wed, 18 Jan 2017 10:51:35 +0100
Subject: [PATCH 1/2] chore(editorconfig): add editorconfig

---
 .editorconfig | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 .editorconfig

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..81adf67
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,15 @@
+root = True
+
+[*]
+end_of_line = lf
+
+[*.js]
+indent_style = tab
+
+[*.md]
+indent_style = space
+indent_size = 2
+
+[{package.json,.travis.yml}]
+indent_style = space
+indent_size = 2

From f6c582d8658a562dc84d4e5558ff8838491347de Mon Sep 17 00:00:00 2001
From: Jason Miller <developit@users.noreply.github.com>
Date: Wed, 18 Jan 2017 12:17:53 -0500
Subject: [PATCH 2/2] Suggested some changes

---
 .editorconfig | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 81adf67..ac0adb7 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,15 +1,17 @@
-root = True
+root = true
 
 [*]
-end_of_line = lf
-
-[*.js]
 indent_style = tab
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
 
-[*.md]
+[{package.json,.*rc,*.yml}]
 indent_style = space
 indent_size = 2
 
-[{package.json,.travis.yml}]
+[*.md]
+trim_trailing_whitespace = false
 indent_style = space
 indent_size = 2