summaryrefslogtreecommitdiff
path: root/vimrc
diff options
context:
space:
mode:
authorUrbain Vaes <urbain@vaes.uk>2015-06-03 18:12:03 +0100
committerUrbain Vaes <urbain@vaes.uk>2015-06-03 18:12:03 +0100
commit4d14de712eae7d9567ad6eb94731fb547872b8a3 (patch)
treef742dd55dcc72af50b6a7c4552a45804a19dbba7 /vimrc
parent4654d5c27926796979bdcf447a89e79a29eedac3 (diff)
parent7344312c66b8d7f90a741dcf5a6a14b86c2f9c42 (diff)
Merge branch 'master' of https://github.com/uvaes/dotfiles
Conflicts: vimrc
Diffstat (limited to 'vimrc')
-rw-r--r--vimrc1
1 files changed, 1 insertions, 0 deletions
diff --git a/vimrc b/vimrc
index 0e03d88..615cab0 100644
--- a/vimrc
+++ b/vimrc
@@ -19,6 +19,7 @@ Plugin 'honza/vim-snippets'
Plugin 'jamessan/vim-gnupg'
Plugin 'junegunn/seoul256.vim'
Plugin 'junegunn/fzf'
+Plugin 'AndrewRadev/splitjoin.vim'
Plugin 'kien/ctrlp.vim'
Plugin 'LaTeX-Box-Team/latex-box'
Plugin 'majutsushi/tagbar'