Removed vim-fugitive

2014-08-31 14:44:43 +02:00
parent aafbd94926
commit 4e74f8cc15
2 changed files with 0 additions and 7 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,9 +13,3 @@
 [submodule "vim/bundle/bufexplorer"]
 	path = vim/bundle/bufexplorer
 	url = git@github.com:jlanzarotta/bufexplorer.git
-<<<<<<< HEAD
-=======
-[submodule "vim/bundle/vim-fugitive"]
-	path = vim/bundle/vim-fugitive
-	url = git@github.com:tpope/vim-fugitive
->>>>>>> 20b22f221bbd693fed9797f0d13ae6a2ce168716
--- a/vim/bundle/vim-fugitive
+++ b/vim/bundle/vim-fugitive