From 1a66435b35f1cd11372de5784ee4ab077b4e512f Mon Sep 17 00:00:00 2001
From: SilentSpike <SilentSpike100+Github@gmail.com>
Date: Wed, 30 Jan 2019 21:47:17 +0000
Subject: [PATCH 1/2] Add .editorconfig file

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

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000000000..cd5933c6d
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,13 @@
+root = true
+
+[*]
+trim_trailing_whitespace = true
+insert_final_newline = false
+
+# for ESLint
+[*.js]
+end_of_line = lf
+
+[*.{js,css,html}]
+indent_style = space
+indent_size = 4
\ No newline at end of file

From 9efcb6096022d297def1a694bbb22e8920528f82 Mon Sep 17 00:00:00 2001
From: SilentSpike <SilentSpike100+Github@gmail.com>
Date: Wed, 30 Jan 2019 22:22:17 +0000
Subject: [PATCH 2/2] Add .json to .editorconfig

---
 .editorconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.editorconfig b/.editorconfig
index cd5933c6d..e46085531 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -8,6 +8,6 @@ insert_final_newline = false
 [*.js]
 end_of_line = lf
 
-[*.{js,css,html}]
+[*.{js,json,css,html}]
 indent_style = space
 indent_size = 4
\ No newline at end of file