From b9250e224438e75c46fca4619c127bf853697209 Mon Sep 17 00:00:00 2001 From: Dreaded_X Date: Fri, 28 Aug 2015 12:26:05 +0200 Subject: [PATCH] Fixed merge hell --- nvim/.nvim/plugged/supertab | 2 +- nvim/.nvim/plugged/vim-snippets | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nvim/.nvim/plugged/supertab b/nvim/.nvim/plugged/supertab index 3d1af98..c8bfece 160000 --- a/nvim/.nvim/plugged/supertab +++ b/nvim/.nvim/plugged/supertab @@ -1 +1 @@ -Subproject commit 3d1af98f5194ef30af94feaa5252c1e3e5e6967e +Subproject commit c8bfeceb1fc92ad58f2ae6967cbfcd6fbcb0d6e7 diff --git a/nvim/.nvim/plugged/vim-snippets b/nvim/.nvim/plugged/vim-snippets index 21c7f20..8a501ed 160000 --- a/nvim/.nvim/plugged/vim-snippets +++ b/nvim/.nvim/plugged/vim-snippets @@ -1 +1 @@ -Subproject commit 21c7f2052057304f9002b42b53391e2c89197a10 +Subproject commit 8a501edad81e8d4421bc58577373087c6b24478e