Merge branch 'master' of github.com:tlevine/vimrc
Conflicts: .gitignore
This commit is contained in:
commit
ca46e9acb9
1 changed files with 4 additions and 2 deletions
6
.gitignore
vendored
6
.gitignore
vendored
|
@ -1,5 +1,7 @@
|
||||||
temp_dirs
|
temp_dirs/undodir
|
||||||
|
temp_dirs/yankring_history_v2.txt
|
||||||
|
my_configs.vim
|
||||||
sources_forked/yankring/doc/tags
|
sources_forked/yankring/doc/tags
|
||||||
|
sources_non_forked/ack.vim/.netrwhist
|
||||||
sources_non_forked/bufexplorer.zip/doc/tags
|
sources_non_forked/bufexplorer.zip/doc/tags
|
||||||
sources_non_forked/tlib/doc/tags
|
sources_non_forked/tlib/doc/tags
|
||||||
sources_non_forked/ack.vim/.netrwhist
|
|
||||||
|
|
Loading…
Reference in a new issue