From 598a7b3cc0427cc62bd5e3203fff43b1bd6796ac Mon Sep 17 00:00:00 2001
From: Dan Schaper <dan.schaper@pi-hole.net>
Date: Wed, 22 Mar 2017 13:44:04 -0700
Subject: [PATCH 1/2] Add .editorconfig

Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
---
 .editorconfig | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 .editorconfig

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000..325648fc
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,38 @@
+# EditorConfig is awesome: http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = tab
+tab_width = 2
+charset = utf-8
+trim_trailing_whitespace = true
+
+# Matches multiple files with brace expansion notation
+# Set default charset
+[*.{js,py}]
+charset = utf-8
+
+# 4 space indentation
+[*.py]
+indent_style = space
+indent_size = 4
+
+# Tab indentation (no size specified)
+[Makefile]
+indent_style = tab
+
+# Indentation override for all JS under lib directory
+[lib/**.js]
+indent_style = space
+indent_size = 2
+
+# Matches the exact files either package.json or .travis.yml
+[{package.json,.travis.yml}]
+indent_style = space
+indent_size = 2

From a832dd7f672340c96e1dfe6a9bad28e8f571b026 Mon Sep 17 00:00:00 2001
From: Dan Schaper <dschaper@users.noreply.github.com>
Date: Thu, 6 Apr 2017 14:55:21 -0700
Subject: [PATCH 2/2] Update .editorconfig

Set path for JS source.
---
 .editorconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.editorconfig b/.editorconfig
index 325648fc..e5626a07 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -28,7 +28,7 @@ indent_size = 4
 indent_style = tab
 
 # Indentation override for all JS under lib directory
-[lib/**.js]
+[scripts/**.js]
 indent_style = space
 indent_size = 2