From e86e4f95fcca349107237f8f4161b9c91e279af1 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Wed, 28 Feb 2018 11:16:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop

---
 .editorconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 6e87a00..9b73521 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -4,7 +4,7 @@
 [*]
 charset = utf-8
 indent_style = space
-indent_size = 2
+indent_size = 4
 insert_final_newline = true
 trim_trailing_whitespace = true
 

--
Gitblit v1.8.0