From: Ben Beltran <redacted>
Date: Fri, 3 Mar 2017 05:10:51 +0000 (-0600)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: https://git.r.bdr.sh/rbdr/dotfiles/commitdiff_plain/35ab4aab6926fb6cd2b44eda8bc14c72a8759b75?hp=28cc50d9af1fd1314afde30169dc22bba5934380

Merge remote-tracking branch 'origin/master'
---

diff --git a/.gitmodules b/.gitmodules
index f867064..64d438b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -106,3 +106,6 @@
 [submodule "vim/bundle/vim-togglelist"]
 	path = vim/bundle/vim-togglelist
 	url = https://github.com/milkypostman/vim-togglelist
+[submodule "vim/bundle/editorconfig-vim"]
+	path = vim/bundle/editorconfig-vim
+	url = https://github.com/editorconfig/editorconfig-vim.git
diff --git a/vim/bundle/editorconfig-vim b/vim/bundle/editorconfig-vim
new file mode 160000
index 0000000..646c180
--- /dev/null
+++ b/vim/bundle/editorconfig-vim
@@ -0,0 +1 @@
+Subproject commit 646c18062e6b168eb485bbc6b51d7c77c23a35e0