Compare commits

..

No commits in common. "42dff7b8cd52a6db94ebd899f2c33efbda801a5e" and "69c5868c40159e79a4f438f446687f7445a3e160" have entirely different histories.

View File

@ -31,11 +31,7 @@ Plug 'neoclide/coc-yaml', {'do': 'yarn install --frozen-lockfile'}
Plug 'neoclide/coc-json', {'do': 'yarn install --frozen-lockfile'}
Plug 'fannheyward/coc-markdownlint', {'do': 'yarn install --frozen-lockfile; npm i -D markdownlint --save-dev'}
Plug 'josa42/coc-sh', {'do': 'yarn install --frozen-lockfile; npm i -D bash-language-server'}
<<<<<<< HEAD
Plug 'neoclide/coc-prettier', {'do': 'yarn install --frozen-lockfile'}
=======
Plug 'prettier/vim-prettier', { 'do': 'yarn install; npm i -D prettier; npm i -D prettier-plugin-sh' }
>>>>>>> 69c5868c40159e79a4f438f446687f7445a3e160
Plug 'dracula/vim', { 'as': 'dracula'}
Plug 'jnurmine/Zenburn', { 'as': 'zenburn'}
Plug 'junegunn/fzf.vim'