ld/amix-vimrc-mirror
1
0
Fork 0
mirror of https://github.com/amix/vimrc synced 2025-07-24 05:24:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/upstream/master'

Browse Source 
Conflicts:
	sources_non_forked/ale/autoload/ale.vim
	sources_non_forked/lightline.vim/doc/lightline.txt
	sources_non_forked/nerdtree/autoload/nerdtree.vim
	sources_non_forked/nerdtree/autoload/nerdtree/ui_glue.vim
	sources_non_forked/vim-fugitive/autoload/fugitive.vim
	sources_non_forked/vim-fugitive/doc/fugitive.txt
This commit is contained in:
geezuslucifer@gmail.com
2021-06-30 14:46:47 -05:00
parent 1cca3b1df2 597b7acdc0
commit 7d3bd53d7c
6 changed files with 214 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sources_non_forked/ale/autoload/ale.vim
View File

@ -160,6 +160,7 @@ endfunction
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
let s:current_ale_version = [2, 5, 0]
=======
let s:current_ale_version = [2, 6, 0]
@ -170,6 +171,9 @@ let s:current_ale_version = [3, 0, 0]
=======
let s:current_ale_version = [3, 1, 0]
>>>>>>> 597b7acdc0316524c7c65c79d4dc9bf3f5cfce70
=======
let s:current_ale_version = [3, 1, 0]
>>>>>>> master
" A function used to check for ALE features in files outside of the project.
function! ale#Has(feature) abort