From 46d6ad4258e804cf869677d5186a7069c456fb51 Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lytedev.io>
Date: Sun, 31 Jul 2016 21:05:14 -0500
Subject: [PATCH] fix merge issues

---
 editor/nvim/config/.gitignore | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/editor/nvim/config/.gitignore b/editor/nvim/config/.gitignore
index 4fe6d82..9780597 100644
--- a/editor/nvim/config/.gitignore
+++ b/editor/nvim/config/.gitignore
@@ -1,3 +1,3 @@
-autoload
-bundle
-undo
+*
+!init.vim
+!./colors/*.vim