From 689d7d1c5d637c41cc44cf9318dc2db3170e3bec Mon Sep 17 00:00:00 2001
From: Tingan Ho <tingan87@gmail.com>
Date: Mon, 2 Mar 2015 12:11:16 +0800
Subject: [PATCH 1/2] Adds editorconfig file

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

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000000..109cdbd79f6
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,10 @@
+
+root = true
+
+[{src,scripts}/**.{ts,json,js}]
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+indent_style = space
+indent_size = 4

From 4c6ebb132b774d829c90f0f3503f5168a31e9d37 Mon Sep 17 00:00:00 2001
From: Tingan Ho <tingan87@gmail.com>
Date: Mon, 2 Mar 2015 12:54:38 +0800
Subject: [PATCH 2/2] Changes to crlf

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

diff --git a/.editorconfig b/.editorconfig
index 109cdbd79f6..8ed330c4a24 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -2,7 +2,7 @@
 root = true
 
 [{src,scripts}/**.{ts,json,js}]
-end_of_line = lf
+end_of_line = crlf
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true