Fixed merge conflict
This commit is contained in:
parent
b98730f6f9
commit
0b55930f13
4
vimrc
4
vimrc
@ -2,8 +2,8 @@ let g:neosnippet#snippets_directory='~/.vim/bundle/snipmate-snippets/snippets'
|
||||
if has('conceal')
|
||||
set conceallevel=2 concealcursor=i
|
||||
endif
|
||||
nnoremap <Leader>autoformat! :%s/, /,<CR>:%s/ \/ /\/<CR>:%s/ {/{<CR>:%s/} /}<CR>:%s/=/=
|
||||
command! W %!sudo tee > /dev/null %
|
||||
nnoremap <Leader>autoformat! :%s/, /,<CR>:%s/ \/ /\/<CR>:%s/ {/{<CR>:%s/} /}<CR>:%s/ = /=
|
||||
command! WW %!sudo tee > /dev/null %
|
||||
autocmd FileType * setlocal formatoptions-=c formatoptions-=r formatoptions-=o
|
||||
autocmd FileType * :hi IndentGuidesOdd guibg=red ctermbg=239
|
||||
autocmd FileType * :hi IndentGuidesEven guibg=white ctermbg=239
|
||||
|
Loading…
x
Reference in New Issue
Block a user