From 0e68efd9aa3bf77f26d432d74afbe9379e7d50cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcin=20Wo=C5=BAniak?= <y0rune@aol.com>
Date: Tue, 6 Apr 2021 09:46:28 +0200
Subject: [PATCH] Added coc
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Marcin Woźniak <y0rune@aol.com>
---
 .config/nvim/init.vim | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index e9a61af..c418e31 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -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'
@@ -62,11 +58,6 @@ syntax on
 filetype plugin indent on
 set encoding=utf-8
 
-" Prettier
-noremap <leader>p :PrettierAsync<CR>
-let g:prettier#config#single_quote = 'true'
-let g:prettier#config#trailing_comma = 'all'
-
 " fzf
 command! -bang -nargs=* Find call fzf#vim#grep('rg --column --line-number --no-heading --fixed-strings --ignore-case --hidden --follow --color "always" '.shellescape(<q-args>), 1, <bang>0)
 command! -bang -nargs=* FindCurrentWord call fzf#vim#grep('rg --column --line-number --no-heading --fixed-strings --ignore-case --hidden --follow --color "always" '.shellescape(expand('<cword>')), 1, <bang>0)