mirror of
https://github.com/amix/vimrc
synced 2025-07-13 06:35:01 +08:00
Merge remote-tracking branch 'upstream/master'
Conflicts: sources_non_forked/syntastic/README.markdown sources_non_forked/syntastic/autoload/syntastic/log.vim sources_non_forked/syntastic/autoload/syntastic/util.vim sources_non_forked/syntastic/doc/syntastic.txt sources_non_forked/syntastic/plugin/syntastic.vim sources_non_forked/syntastic/plugin/syntastic/autoloclist.vim sources_non_forked/syntastic/plugin/syntastic/balloons.vim sources_non_forked/syntastic/plugin/syntastic/checker.vim sources_non_forked/syntastic/plugin/syntastic/cursor.vim sources_non_forked/syntastic/plugin/syntastic/loclist.vim sources_non_forked/syntastic/plugin/syntastic/modemap.vim sources_non_forked/syntastic/plugin/syntastic/notifiers.vim sources_non_forked/syntastic/plugin/syntastic/registry.vim sources_non_forked/syntastic/plugin/syntastic/signs.vim sources_non_forked/syntastic/syntax_checkers/html/tidy.vim sources_non_forked/syntastic/syntax_checkers/javascript/closurecompiler.vim sources_non_forked/syntastic/syntax_checkers/sh/bashate.vim sources_non_forked/vim-airline/README.md sources_non_forked/vim-airline/autoload/airline/extensions/tabline.vim sources_non_forked/vim-snippets/UltiSnips/html.snippets
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@ -4,3 +4,4 @@ temp_dirs/yankring_history_v2.txt
|
||||
sources_forked/yankring/doc/tags
|
||||
sources_non_forked/tlib/doc/tags
|
||||
tags
|
||||
.DS_Store
|
||||
|
Reference in New Issue
Block a user