From 7d7f671920a5fb6417b0b68f0c76a8309e5f7066 Mon Sep 17 00:00:00 2001
From: Lucien Greathouse <me@lpghatguy.com>
Date: Sun, 10 Jun 2018 22:50:37 -0700
Subject: [PATCH] merge impl-v2: .editorconfig

---
 .editorconfig | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 702598e1..198a492d 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -3,13 +3,16 @@ root = true
 [*]
 end_of_line = lf
 charset = utf-8
-
-[*.json]
-indent_style = space
-indent_size = 2
+insert_final_newline = false
 trim_trailing_whitespace = true
 
-[*.md]
+[*.{json,js,css}]
+indent_style = space
+indent_size = 2
+
+[*.{md,rs}]
 indent_style = space
 indent_size = 4
-trim_trailing_whitespace = true
\ No newline at end of file
+
+[*.lua]
+indent_style = tab
\ No newline at end of file