From e50173c7dc638b480804ccde94d848b3d028160d Mon Sep 17 00:00:00 2001
From: Anton Kaliaev <anton.kalyaev@gmail.com>
Date: Mon, 4 Dec 2017 15:01:28 -0600
Subject: [PATCH] merge 2 rules in .editorconfig

---
 .editorconfig | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 82f774362..481621f76 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -8,10 +8,7 @@ end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = true
 
-[Makefile]
-indent_style = tab
-
-[*.sh]
+[*.{sh,Makefile}]
 indent_style = tab
 
 [*.proto]