geezuslucifer@gmail.com 43c7efba8d Merge remote-tracking branch 'refs/remotes/upstream/master' ... Conflicts: sources_non_forked/ale/autoload/ale.vim sources_non_forked/lightline.vim/doc/lightline.txt sources_non_forked/nerdtree/.github/PULL_REQUEST_TEMPLATE.md sources_non_forked/nerdtree/autoload/nerdtree.vim sources_non_forked/nerdtree/plugin/NERD_tree.vim sources_non_forked/vim-fugitive/autoload/fugitive.vim sources_non_forked/vim-fugitive/doc/fugitive.txt		2021-02-19 08:50:18 -06:00
..
NERD_tree.vim	Merge remote-tracking branch 'refs/remotes/upstream/master'	2021-02-19 08:50:18 -06:00