diff options
author | Julian Teu <julianteule@gmail.com> | 2018-04-10 18:00:16 +0200 |
---|---|---|
committer | Julian Teu <julianteule@gmail.com> | 2018-04-10 18:00:16 +0200 |
commit | a3443fca6351cbe9ecbbe29a32e358f7534a92a6 (patch) | |
tree | 296984730873b0fa7f20a34b3563e1f936c05ba6 /.vimrc | |
parent | 52361a79f3ed0e1b1f20e30f4fd07f0a2e6e733a (diff) | |
parent | 754ae9b40221d38dc176e6c04f17b341f2390242 (diff) |
Manual merge conflict
Diffstat (limited to '.vimrc')
-rw-r--r-- | .vimrc | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -16,6 +16,8 @@ Plugin 'tpope/vim-repeat' Plugin 'tpope/vim-speeddating' Plugin 'vim-latex/vim-latex' +Plugin 'vim-scripts/ReplaceWithRegister' + Plugin 'vim-erlang/vim-erlang-runtime' |